diff options
Diffstat (limited to 'includes/Article.php')
| -rw-r--r-- | includes/Article.php | 1138 |
1 files changed, 805 insertions, 333 deletions
diff --git a/includes/Article.php b/includes/Article.php index 5edfc10d..3e8cfd5e 100644 --- a/includes/Article.php +++ b/includes/Article.php @@ -11,6 +11,7 @@ * Note: edit user interface and cache support functions have been * moved to separate EditPage and HTMLFileCache classes. * + * @internal documentation reviewed 15 Mar 2010 */ class Article { /**@{{ @@ -33,15 +34,15 @@ class Article { var $mRedirectTarget = null; // !< Title object if set var $mRedirectUrl = false; // !< var $mRevIdFetched = 0; // !< - var $mRevision; // !< + var $mRevision; // !< Revision object if set var $mTimestamp = ''; // !< - var $mTitle; // !< + var $mTitle; // !< Title object var $mTotalAdjustment = 0; // !< var $mTouched = '19700101000000'; // !< var $mUser = -1; // !< Not loaded - var $mUserText = ''; // !< - var $mParserOptions; // !< - var $mParserOutput; // !< + var $mUserText = ''; // !< username from Revision if set + var $mParserOptions; // !< ParserOptions object + var $mParserOutput; // !< ParserCache object if set /**@}}*/ /** @@ -50,12 +51,13 @@ class Article { * @param $oldId Integer revision ID, null to fetch from request, zero for current */ public function __construct( Title $title, $oldId = null ) { + // FIXME: does the reference play any role here? $this->mTitle =& $title; $this->mOldId = $oldId; } /** - * Constructor from an article article + * Constructor from an page id * @param $id The article ID to load */ public static function newFromID( $id ) { @@ -70,7 +72,7 @@ class Article { * from another page on the wiki. * @param $from Title object. */ - public function setRedirectedFrom( $from ) { + public function setRedirectedFrom( Title $from ) { $this->mRedirectedFrom = $from; } @@ -82,20 +84,29 @@ class Article { * @return mixed Title object, or null if this page is not a redirect */ public function getRedirectTarget() { - if ( !$this->mTitle || !$this->mTitle->isRedirect() ) + if ( !$this->mTitle->isRedirect() ) { return null; - if ( !is_null( $this->mRedirectTarget ) ) + } + + if ( $this->mRedirectTarget !== null ) { return $this->mRedirectTarget; + } + # Query the redirect table $dbr = wfGetDB( DB_SLAVE ); $row = $dbr->selectRow( 'redirect', - array( 'rd_namespace', 'rd_title' ), + array( 'rd_namespace', 'rd_title', 'rd_fragment', 'rd_interwiki' ), array( 'rd_from' => $this->getID() ), __METHOD__ ); - if ( $row ) { - return $this->mRedirectTarget = Title::makeTitle( $row->rd_namespace, $row->rd_title ); + + // rd_fragment and rd_interwiki were added later, populate them if empty + if ( $row && !is_null( $row->rd_fragment ) && !is_null( $row->rd_interwiki ) ) { + return $this->mRedirectTarget = Title::makeTitle( + $row->rd_namespace, $row->rd_title, + $row->rd_fragment, $row->rd_interwiki ); } + # This page doesn't have an entry in the redirect table return $this->mRedirectTarget = $this->insertRedirect(); } @@ -104,43 +115,66 @@ class Article { * Insert an entry for this page into the redirect table. * * Don't call this function directly unless you know what you're doing. - * @return Title object + * @return Title object or null if not a redirect */ public function insertRedirect() { - $retval = Title::newFromRedirect( $this->getContent() ); + // recurse through to only get the final target + $retval = Title::newFromRedirectRecurse( $this->getContent() ); if ( !$retval ) { return null; } + $this->insertRedirectEntry( $retval ); + return $retval; + } + + /** + * Insert or update the redirect table entry for this page to indicate + * it redirects to $rt . + * @param $rt Title redirect target + */ + public function insertRedirectEntry( $rt ) { $dbw = wfGetDB( DB_MASTER ); $dbw->replace( 'redirect', array( 'rd_from' ), array( 'rd_from' => $this->getID(), - 'rd_namespace' => $retval->getNamespace(), - 'rd_title' => $retval->getDBkey() + 'rd_namespace' => $rt->getNamespace(), + 'rd_title' => $rt->getDBkey(), + 'rd_fragment' => $rt->getFragment(), + 'rd_interwiki' => $rt->getInterwiki(), ), __METHOD__ ); - return $retval; } /** - * Get the Title object this page redirects to + * Get the Title object or URL this page redirects to * * @return mixed false, Title of in-wiki target, or string with URL */ public function followRedirect() { - $text = $this->getContent(); - return $this->followRedirectText( $text ); + return $this->getRedirectURL( $this->getRedirectTarget() ); } /** * Get the Title object this text redirects to * + * @param $text string article content containing redirect info * @return mixed false, Title of in-wiki target, or string with URL + * @deprecated */ public function followRedirectText( $text ) { - $rt = Title::newFromRedirectRecurse( $text ); // recurse through to only get the final target - # process if title object is valid and not special:userlogout + // recurse through to only get the final target + return $this->getRedirectURL( Title::newFromRedirectRecurse( $text ) ); + } + + /** + * Get the Title object or URL to use for a redirect. We use Title + * objects for same-wiki, non-special redirects and URLs for everything + * else. + * @param $rt Title Redirect target + * @return mixed false, Title object of local target, or string with URL + */ + public function getRedirectURL( $rt ) { if ( $rt ) { if ( $rt->getInterwiki() != '' ) { if ( $rt->isLocal() ) { @@ -164,15 +198,18 @@ class Article { return $rt->getFullURL(); } } + return $rt; } } + // No or invalid redirect return false; } /** - * get the title object of the article + * Get the title object of the article + * @return Title object of this page */ public function getTitle() { return $this->mTitle; @@ -180,6 +217,7 @@ class Article { /** * Clear the object + * FIXME: shouldn't this be public? * @private */ public function clear() { @@ -204,31 +242,38 @@ class Article { /** * Note that getContent/loadContent do not follow redirects anymore. * If you need to fetch redirectable content easily, try - * the shortcut in Article::followContent() + * the shortcut in Article::followRedirect() + * + * This function has side effects! Do not use this function if you + * only want the real revision text if any. * * @return Return the text of this revision */ public function getContent() { - global $wgUser, $wgContLang, $wgOut, $wgMessageCache; + global $wgUser, $wgContLang, $wgMessageCache; + wfProfileIn( __METHOD__ ); + if ( $this->getID() === 0 ) { # If this is a MediaWiki:x message, then load the messages # and return the message value for x. if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) { # If this is a system message, get the default text. list( $message, $lang ) = $wgMessageCache->figureMessage( $wgContLang->lcfirst( $this->mTitle->getText() ) ); - $wgMessageCache->loadAllMessages( $lang ); $text = wfMsgGetKey( $message, false, $lang, false ); + if ( wfEmptyMsg( $message, $text ) ) $text = ''; } else { $text = wfMsgExt( $wgUser->isLoggedIn() ? 'noarticletext' : 'noarticletextanon', 'parsemag' ); } wfProfileOut( __METHOD__ ); + return $text; } else { $this->loadContent(); wfProfileOut( __METHOD__ ); + return $this->mContent; } } @@ -243,8 +288,10 @@ class Article { if ( $this->mContentLoaded && $this->mOldId == 0 ) { return $this->mContent; } + $rev = Revision::newFromTitle( $this->mTitle ); $text = $rev ? $rev->getRawText() : false; + return $text; } @@ -274,16 +321,25 @@ class Article { * @return mixed string on success, false on failure */ public function getUndoText( Revision $undo, Revision $undoafter = null ) { + $currentRev = Revision::newFromTitle( $this->mTitle ); + if ( !$currentRev ) { + return false; // no page + } $undo_text = $undo->getText(); $undoafter_text = $undoafter->getText(); - $cur_text = $this->getContent(); + $cur_text = $currentRev->getText(); + if ( $cur_text == $undo_text ) { # No use doing a merge if it's just a straight revert. return $undoafter_text; } + $undone_text = ''; - if ( !wfMerge( $undo_text, $undoafter_text, $cur_text, $undone_text ) ) + + if ( !wfMerge( $undo_text, $undoafter_text, $cur_text, $undone_text ) ) { return false; + } + return $undone_text; } @@ -295,6 +351,7 @@ class Article { if ( is_null( $this->mOldId ) ) { $this->mOldId = $this->getOldIDFromRequest(); } + return $this->mOldId; } @@ -305,13 +362,16 @@ class Article { */ public function getOldIDFromRequest() { global $wgRequest; + $this->mRedirectUrl = false; + $oldid = $wgRequest->getVal( 'oldid' ); + if ( isset( $oldid ) ) { $oldid = intval( $oldid ); if ( $wgRequest->getVal( 'direction' ) == 'next' ) { $nextid = $this->mTitle->getNextRevisionID( $oldid ); - if ( $nextid ) { + if ( $nextid ) { $oldid = $nextid; } else { $this->mRedirectUrl = $this->mTitle->getFullURL( 'redirect=no' ); @@ -323,9 +383,11 @@ class Article { } } } + if ( !$oldid ) { $oldid = 0; } + return $oldid; } @@ -333,22 +395,24 @@ class Article { * Load the revision (including text) into this object */ function loadContent() { - if ( $this->mContentLoaded ) return; + if ( $this->mContentLoaded ) { + return; + } + wfProfileIn( __METHOD__ ); - # Query variables :P + $oldid = $this->getOldID(); - # Pre-fill content with error message so that if something - # fails we'll have something telling us what we intended. $this->mOldId = $oldid; $this->fetchContent( $oldid ); + wfProfileOut( __METHOD__ ); } - /** * Fetch a page record with the given conditions * @param $dbr Database object * @param $conditions Array + * @return mixed Database result resource, or false on failure */ protected function pageData( $dbr, $conditions ) { $fields = array( @@ -364,20 +428,23 @@ class Article { 'page_latest', 'page_len', ); + wfRunHooks( 'ArticlePageDataBefore', array( &$this, &$fields ) ); - $row = $dbr->selectRow( - 'page', - $fields, - $conditions, - __METHOD__ - ); + + $row = $dbr->selectRow( 'page', $fields, $conditions, __METHOD__ ); + wfRunHooks( 'ArticlePageDataAfter', array( &$this, &$row ) ); - return $row ; + + return $row; } /** + * Fetch a page record matching the Title object's namespace and title + * using a sanitized title string + * * @param $dbr Database object * @param $title Title object + * @return mixed Database result resource, or false on failure */ public function pageDataFromTitle( $dbr, $title ) { return $this->pageData( $dbr, array( @@ -386,6 +453,8 @@ class Article { } /** + * Fetch a page record matching the requested ID + * * @param $dbr Database * @param $id Integer */ @@ -406,8 +475,9 @@ class Article { } $lc = LinkCache::singleton(); + if ( $data ) { - $lc->addGoodLinkObj( $data->page_id, $this->mTitle, $data->page_len, $data->page_is_redirect ); + $lc->addGoodLinkObj( $data->page_id, $this->mTitle, $data->page_len, $data->page_is_redirect, $data->page_latest ); $this->mTitle->mArticleID = intval( $data->page_id ); @@ -419,20 +489,19 @@ class Article { $this->mIsRedirect = intval( $data->page_is_redirect ); $this->mLatest = intval( $data->page_latest ); } else { - if ( is_object( $this->mTitle ) ) { - $lc->addBadLinkObj( $this->mTitle ); - } + $lc->addBadLinkObj( $this->mTitle ); $this->mTitle->mArticleID = 0; } - $this->mDataLoaded = true; + $this->mDataLoaded = true; } /** * Get text of an article from database * Does *NOT* follow redirects. + * * @param $oldid Int: 0 for whatever the latest revision is - * @return string + * @return mixed string containing article contents, or false if null */ function fetchContent( $oldid = 0 ) { if ( $this->mContentLoaded ) { @@ -449,28 +518,33 @@ class Article { if ( $oldid ) { $revision = Revision::newFromId( $oldid ); - if ( is_null( $revision ) ) { + if ( $revision === null ) { wfDebug( __METHOD__ . " failed to retrieve specified revision, id $oldid\n" ); return false; } + $data = $this->pageDataFromId( $dbr, $revision->getPage() ); + if ( !$data ) { wfDebug( __METHOD__ . " failed to get page data linked to revision id $oldid\n" ); return false; } + $this->mTitle = Title::makeTitle( $data->page_namespace, $data->page_title ); $this->loadPageData( $data ); } else { if ( !$this->mDataLoaded ) { $data = $this->pageDataFromTitle( $dbr, $this->mTitle ); + if ( !$data ) { wfDebug( __METHOD__ . " failed to find page data for title " . $this->mTitle->getPrefixedText() . "\n" ); return false; } + $this->loadPageData( $data ); } $revision = Revision::newFromId( $this->mLatest ); - if ( is_null( $revision ) ) { + if ( $revision === null ) { wfDebug( __METHOD__ . " failed to retrieve current page, rev_id {$this->mLatest}\n" ); return false; } @@ -489,7 +563,7 @@ class Article { $this->mContentLoaded = true; $this->mRevision =& $revision; - wfRunHooks( 'ArticleAfterFetchContent', array( &$this, &$this->mContent ) ) ; + wfRunHooks( 'ArticleAfterFetchContent', array( &$this, &$this->mContent ) ); return $this->mContent; } @@ -498,23 +572,13 @@ class Article { * Read/write accessor to select FOR UPDATE * * @param $x Mixed: FIXME + * @return mixed value of $x, or value stored in Article::mForUpdate */ public function forUpdate( $x = null ) { return wfSetVar( $this->mForUpdate, $x ); } /** - * Get the database which should be used for reads - * - * @return Database - * @deprecated - just call wfGetDB( DB_MASTER ) instead - */ - function getDB() { - wfDeprecated( __METHOD__ ); - return wfGetDB( DB_MASTER ); - } - - /** * Get options for all SELECT statements * * @param $options Array: an optional options array which'll be appended to @@ -529,6 +593,7 @@ class Article { $options = 'FOR UPDATE'; } } + return $options; } @@ -536,11 +601,7 @@ class Article { * @return int Page ID */ public function getID() { - if ( $this->mTitle ) { - return $this->mTitle->getArticleID(); - } else { - return 0; - } + return $this->mTitle->getArticleID(); } /** @@ -568,6 +629,7 @@ class Article { public function getCount() { if ( -1 == $this->mCounter ) { $id = $this->getID(); + if ( $id == 0 ) { $this->mCounter = 0; } else { @@ -580,11 +642,12 @@ class Article { ); } } + return $this->mCounter; } /** - * Determine whether a page would be suitable for being counted as an + * Determine whether a page would be suitable for being counted as an * article in the site_stats table based on the title & its content * * @param $text String: text to analyze @@ -594,13 +657,14 @@ class Article { global $wgUseCommaCount; $token = $wgUseCommaCount ? ',' : '[['; + return $this->mTitle->isContentPage() && !$this->isRedirect( $text ) && in_string( $token, $text ); } /** * Tests if the article text represents a redirect * - * @param $text String: FIXME + * @param $text mixed string containing article contents, or boolean * @return bool */ public function isRedirect( $text = false ) { @@ -608,12 +672,14 @@ class Article { if ( $this->mDataLoaded ) { return $this->mIsRedirect; } + // Apparently loadPageData was never called $this->loadContent(); $titleObj = Title::newFromRedirectRecurse( $this->fetchContent() ); } else { $titleObj = Title::newFromRedirect( $text ); } + return $titleObj !== null; } @@ -627,6 +693,7 @@ class Article { if ( $this->getOldID() == 0 ) { return true; } + return $this->exists() && isset( $this->mRevision ) && $this->mRevision->isCurrent(); } @@ -635,12 +702,15 @@ class Article { * This isn't necessary for all uses, so it's only done if needed. */ protected function loadLastEdit() { - if ( -1 != $this->mUser ) + if ( -1 != $this->mUser ) { return; + } # New or non-existent articles have no user information $id = $this->getID(); - if ( 0 == $id ) return; + if ( 0 == $id ) { + return; + } $this->mLastRevision = Revision::loadFromPageId( wfGetDB( DB_MASTER ), $id ); if ( !is_null( $this->mLastRevision ) ) { @@ -653,46 +723,71 @@ class Article { } } + /** + * @return string GMT timestamp of last article revision + **/ + public function getTimestamp() { // Check if the field has been filled by ParserCache::get() if ( !$this->mTimestamp ) { $this->loadLastEdit(); } + return wfTimestamp( TS_MW, $this->mTimestamp ); } + /** + * @return int user ID for the user that made the last article revision + */ public function getUser() { $this->loadLastEdit(); return $this->mUser; } + /** + * @return string username of the user that made the last article revision + */ public function getUserText() { $this->loadLastEdit(); return $this->mUserText; } + /** + * @return string Comment stored for the last article revision + */ public function getComment() { $this->loadLastEdit(); return $this->mComment; } + /** + * Returns true if last revision was marked as "minor edit" + * + * @return boolean Minor edit indicator for the last article revision. + */ public function getMinorEdit() { $this->loadLastEdit(); return $this->mMinorEdit; } - /* Use this to fetch the rev ID used on page views */ + /** + * Use this to fetch the rev ID used on page views + * + * @return int revision ID of last article revision + */ public function getRevIdFetched() { $this->loadLastEdit(); return $this->mRevIdFetched; } /** + * FIXME: this does what? * @param $limit Integer: default 0. * @param $offset Integer: default 0. + * @return UserArrayFromResult object with User objects of article contributors for requested range */ public function getContributors( $limit = 0, $offset = 0 ) { - # XXX: this is expensive; cache this info somewhere. + # FIXME: this is expensive; cache this info somewhere. $dbr = wfGetDB( DB_SLAVE ); $revTable = $dbr->tableName( 'revision' ); @@ -701,6 +796,7 @@ class Article { $pageId = $this->getId(); $user = $this->getUser(); + if ( $user ) { $excludeCond = "AND rev_user != $user"; } else { @@ -718,8 +814,9 @@ class Article { GROUP BY rev_user, rev_user_text ORDER BY timestamp DESC"; - if ( $limit > 0 ) + if ( $limit > 0 ) { $sql = $dbr->limitResult( $sql, $limit, $offset ); + } $sql .= ' ' . $this->getSelectOptions(); $res = $dbr->query( $sql, __METHOD__ ); @@ -732,9 +829,8 @@ class Article { * page of the given title. */ public function view() { - global $wgUser, $wgOut, $wgRequest, $wgContLang; - global $wgEnableParserCache, $wgStylePath, $wgParser; - global $wgUseTrackbacks, $wgUseFileCache; + global $wgUser, $wgOut, $wgRequest, $wgParser; + global $wgUseFileCache, $wgUseETag; wfProfileIn( __METHOD__ ); @@ -742,22 +838,26 @@ class Article { $oldid = $this->getOldID(); $parserCache = ParserCache::singleton(); - $parserOptions = clone $this->getParserOptions(); + $parserOptions = $this->getParserOptions(); # Render printable version, use printable version cache if ( $wgOut->isPrintable() ) { $parserOptions->setIsPrintable( true ); + $parserOptions->setEditSection( false ); + } else if ( $wgUseETag && !$this->mTitle->quickUserCan( 'edit' ) ) { + $parserOptions->setEditSection( false ); } # Try client and file cache if ( $oldid === 0 && $this->checkTouched() ) { - global $wgUseETag; if ( $wgUseETag ) { $wgOut->setETag( $parserCache->getETag( $this, $parserOptions ) ); } - # Is is client cached? + + # Is it client cached? if ( $wgOut->checkLastModified( $this->getTouched() ) ) { wfDebug( __METHOD__ . ": done 304\n" ); wfProfileOut( __METHOD__ ); + return; # Try file cache } else if ( $wgUseFileCache && $this->tryFileCache() ) { @@ -766,17 +866,17 @@ class Article { $wgOut->disable(); $this->viewUpdates(); wfProfileOut( __METHOD__ ); + return; } } - $sk = $wgUser->getSkin(); - # getOldID may want us to redirect somewhere else if ( $this->mRedirectUrl ) { $wgOut->redirect( $this->mRedirectUrl ); wfDebug( __METHOD__ . ": redirecting due to oldid\n" ); wfProfileOut( __METHOD__ ); + return; } @@ -785,20 +885,25 @@ class Article { $wgOut->setPageTitle( $this->mTitle->getPrefixedText() ); # If we got diff in the query, we want to see a diff page instead of the article. - if ( !is_null( $wgRequest->getVal( 'diff' ) ) ) { + if ( $wgRequest->getCheck( 'diff' ) ) { wfDebug( __METHOD__ . ": showing diff page\n" ); $this->showDiffPage(); wfProfileOut( __METHOD__ ); + return; } # Allow frames by default $wgOut->allowClickjacking(); + if ( !$wgUseETag && !$this->mTitle->quickUserCan( 'edit' ) ) { + $parserOptions->setEditSection( false ); + } + # Should the parser cache be used? $useParserCache = $this->useParserCache( $oldid ); wfDebug( 'Article::view using parser cache: ' . ( $useParserCache ? 'yes' : 'no' ) . "\n" ); - if ( $wgUser->getOption( 'stubthreshold' ) ) { + if ( $wgUser->getStubThreshold() ) { wfIncrStats( 'pcache_miss_stub' ); } @@ -810,16 +915,17 @@ class Article { $pass = 0; $outputDone = false; $this->mParserOutput = false; + while ( !$outputDone && ++$pass ) { switch( $pass ) { case 1: wfRunHooks( 'ArticleViewHeader', array( &$this, &$outputDone, &$useParserCache ) ); break; - case 2: # Try the parser cache if ( $useParserCache ) { $this->mParserOutput = $parserCache->get( $this, $parserOptions ); + if ( $this->mParserOutput !== false ) { wfDebug( __METHOD__ . ": showing parser cache contents\n" ); $wgOut->addParserOutput( $this->mParserOutput ); @@ -830,7 +936,6 @@ class Article { } } break; - case 3: $text = $this->getContent(); if ( $text === false || $this->getID() == 0 ) { @@ -853,22 +958,22 @@ class Article { # Are we looking at an old revision if ( $oldid && !is_null( $this->mRevision ) ) { $this->setOldSubtitle( $oldid ); + if ( !$this->showDeletedRevisionHeader() ) { wfDebug( __METHOD__ . ": cannot view deleted revision\n" ); wfProfileOut( __METHOD__ ); return; } + # If this "old" version is the current, then try the parser cache... if ( $oldid === $this->getLatest() && $this->useParserCache( false ) ) { $this->mParserOutput = $parserCache->get( $this, $parserOptions ); if ( $this->mParserOutput ) { - wfDebug( __METHOD__ . ": showing parser cache for current rev permalink\n" ); + wfDebug( __METHOD__ . ": showing parser cache for current rev permalink\n" ); $wgOut->addParserOutput( $this->mParserOutput ); $wgOut->setRevisionId( $this->mLatest ); - $this->showViewFooter(); - $this->viewUpdates(); - wfProfileOut( __METHOD__ ); - return; + $outputDone = true; + break; } } } @@ -882,36 +987,35 @@ class Article { wfDebug( __METHOD__ . ": showing CSS/JS source\n" ); $this->showCssOrJsPage(); $outputDone = true; - } else if ( $rt = Title::newFromRedirectArray( $text ) ) { - wfDebug( __METHOD__ . ": showing redirect=no page\n" ); - # Viewing a redirect page (e.g. with parameter redirect=no) - # Don't append the subtitle if this was an old revision - $wgOut->addHTML( $this->viewRedirect( $rt, !$wasRedirected && $this->isCurrent() ) ); - # Parse just to get categories, displaytitle, etc. - $this->mParserOutput = $wgParser->parse( $text, $this->mTitle, $parserOptions ); - $wgOut->addParserOutputNoText( $this->mParserOutput ); - $outputDone = true; + } else { + $rt = Title::newFromRedirectArray( $text ); + if ( $rt ) { + wfDebug( __METHOD__ . ": showing redirect=no page\n" ); + # Viewing a redirect page (e.g. with parameter redirect=no) + # Don't append the subtitle if this was an old revision + $wgOut->addHTML( $this->viewRedirect( $rt, !$wasRedirected && $this->isCurrent() ) ); + # Parse just to get categories, displaytitle, etc. + $this->mParserOutput = $wgParser->parse( $text, $this->mTitle, $parserOptions ); + $wgOut->addParserOutputNoText( $this->mParserOutput ); + $outputDone = true; + } } break; - case 4: # Run the parse, protected by a pool counter wfDebug( __METHOD__ . ": doing uncached parse\n" ); - $key = $parserCache->getKey( $this, $parserOptions ); - $poolCounter = PoolCounter::factory( 'Article::view', $key ); - $dirtyCallback = $useParserCache ? array( $this, 'tryDirtyCache' ) : false; - $status = $poolCounter->executeProtected( array( $this, 'doViewParse' ), $dirtyCallback ); - if ( !$status->isOK() ) { + $key = $parserCache->getKey( $this, $parserOptions ); + $poolArticleView = new PoolWorkArticleView( $this, $key, $useParserCache, $parserOptions ); + + if ( !$poolArticleView->execute() ) { # Connection or timeout error - $this->showPoolError( $status ); wfProfileOut( __METHOD__ ); return; } else { $outputDone = true; } break; - # Should be unreachable, but just in case... default: break 2; @@ -921,6 +1025,7 @@ class Article { # Adjust the title if it was set by displaytitle, -{T|}- or language conversion if ( $this->mParserOutput ) { $titleText = $this->mParserOutput->getTitleText(); + if ( strval( $titleText ) !== '' ) { $wgOut->setPageTitle( $titleText ); } @@ -929,6 +1034,7 @@ class Article { # For the main page, overwrite the <title> element with the con- # tents of 'pagetitle-view-mainpage' instead of the default (if # that's not empty). + # This message always exists because it is in the i18n files if ( $this->mTitle->equals( Title::newMainPage() ) && ( $m = wfMsgForContent( 'pagetitle-view-mainpage' ) ) !== '' ) { @@ -951,7 +1057,7 @@ class Article { * Article::view() only, other callers should use the DifferenceEngine class. */ public function showDiffPage() { - global $wgOut, $wgRequest, $wgUser; + global $wgRequest, $wgUser; $diff = $wgRequest->getVal( 'diff' ); $rcid = $wgRequest->getVal( 'rcid' ); @@ -980,9 +1086,11 @@ class Article { * This is hooked by SyntaxHighlight_GeSHi to do syntax highlighting of these * page views. */ - public function showCssOrJsPage() { + protected function showCssOrJsPage() { global $wgOut; - $wgOut->addHTML( wfMsgExt( 'clearyourcache', 'parse' ) ); + + $wgOut->wrapWikiMsg( "<div id='mw-clearyourcache'>\n$1\n</div>", 'clearyourcache' ); + // Give hooks a chance to customise the output if ( wfRunHooks( 'ShowRawCssJs', array( $this->mContent, $this->mTitle, $wgOut ) ) ) { // Wrap the whole lot in a <pre> and don't parse @@ -995,52 +1103,48 @@ class Article { } /** - * Get the robot policy to be used for the current action=view request. - * @return String the policy that should be set - * @deprecated use getRobotPolicy() instead, which returns an associative - * array - */ - public function getRobotPolicyForView() { - wfDeprecated( __FUNC__ ); - $policy = $this->getRobotPolicy( 'view' ); - return $policy['index'] . ',' . $policy['follow']; - } - - /** * Get the robot policy to be used for the current view * @param $action String the action= GET parameter * @return Array the policy that should be set * TODO: actions other than 'view' */ public function getRobotPolicy( $action ) { - global $wgOut, $wgArticleRobotPolicies, $wgNamespaceRobotPolicies; global $wgDefaultRobotPolicy, $wgRequest; $ns = $this->mTitle->getNamespace(); + if ( $ns == NS_USER || $ns == NS_USER_TALK ) { # Don't index user and user talk pages for blocked users (bug 11443) if ( !$this->mTitle->isSubpage() ) { $block = new Block(); if ( $block->load( $this->mTitle->getText() ) ) { - return array( 'index' => 'noindex', - 'follow' => 'nofollow' ); + return array( + 'index' => 'noindex', + 'follow' => 'nofollow' + ); } } } if ( $this->getID() === 0 || $this->getOldID() ) { # Non-articles (special pages etc), and old revisions - return array( 'index' => 'noindex', - 'follow' => 'nofollow' ); + return array( + 'index' => 'noindex', + 'follow' => 'nofollow' + ); } elseif ( $wgOut->isPrintable() ) { # Discourage indexing of printable versions, but encourage following - return array( 'index' => 'noindex', - 'follow' => 'follow' ); + return array( + 'index' => 'noindex', + 'follow' => 'follow' + ); } elseif ( $wgRequest->getInt( 'curid' ) ) { # For ?curid=x urls, disallow indexing - return array( 'index' => 'noindex', - 'follow' => 'follow' ); + return array( + 'index' => 'noindex', + 'follow' => 'follow' + ); } # Otherwise, construct the policy based on the various config variables. @@ -1048,24 +1152,29 @@ class Article { if ( isset( $wgNamespaceRobotPolicies[$ns] ) ) { # Honour customised robot policies for this namespace - $policy = array_merge( $policy, - self::formatRobotPolicy( $wgNamespaceRobotPolicies[$ns] ) ); + $policy = array_merge( + $policy, + self::formatRobotPolicy( $wgNamespaceRobotPolicies[$ns] ) + ); } if ( $this->mTitle->canUseNoindex() && is_object( $this->mParserOutput ) && $this->mParserOutput->getIndexPolicy() ) { # __INDEX__ and __NOINDEX__ magic words, if allowed. Incorporates # a final sanity check that we have really got the parser output. - $policy = array_merge( $policy, - array( 'index' => $this->mParserOutput->getIndexPolicy() ) ); + $policy = array_merge( + $policy, + array( 'index' => $this->mParserOutput->getIndexPolicy() ) + ); } if ( isset( $wgArticleRobotPolicies[$this->mTitle->getPrefixedText()] ) ) { # (bug 14900) site config can override user-defined __INDEX__ or __NOINDEX__ - $policy = array_merge( $policy, - self::formatRobotPolicy( $wgArticleRobotPolicies[$this->mTitle->getPrefixedText()] ) ); + $policy = array_merge( + $policy, + self::formatRobotPolicy( $wgArticleRobotPolicies[$this->mTitle->getPrefixedText()] ) + ); } return $policy; - } /** @@ -1093,6 +1202,7 @@ class Article { $arr['follow'] = $var; } } + return $arr; } @@ -1100,12 +1210,15 @@ class Article { * If this request is a redirect view, send "redirected from" subtitle to * $wgOut. Returns true if the header was needed, false if this is not a * redirect view. Handles both local and remote redirects. + * + * @return boolean */ public function showRedirectedFromHeader() { global $wgOut, $wgUser, $wgRequest, $wgRedirectSources; $rdfrom = $wgRequest->getVal( 'rdfrom' ); $sk = $wgUser->getSkin(); + if ( isset( $this->mRedirectedFrom ) ) { // This is an internally redirected page view. // We'll need a backlink to the source page for navigation. @@ -1117,6 +1230,7 @@ class Article { array( 'redirect' => 'no' ), array( 'known', 'noclasses' ) ); + $s = wfMsgExt( 'redirectedfrom', array( 'parseinline', 'replaceafter' ), $redir ); $wgOut->setSubtitle( $s ); @@ -1130,6 +1244,7 @@ class Article { $wgOut->addLink( array( 'rel' => 'canonical', 'href' => $this->mTitle->getLocalURL() ) ); + return true; } } elseif ( $rdfrom ) { @@ -1139,9 +1254,11 @@ class Article { $redir = $sk->makeExternalLink( $rdfrom, $rdfrom ); $s = wfMsgExt( 'redirectedfrom', array( 'parseinline', 'replaceafter' ), $redir ); $wgOut->setSubtitle( $s ); + return true; } } + return false; } @@ -1151,10 +1268,11 @@ class Article { */ public function showNamespaceHeader() { global $wgOut; + if ( $this->mTitle->isTalkPage() ) { $msg = wfMsgNoTrans( 'talkpageheader' ); if ( $msg !== '-' && !wfEmptyMsg( 'talkpageheader', $msg ) ) { - $wgOut->wrapWikiMsg( "<div class=\"mw-talkpageheader\">\n$1</div>", array( 'talkpageheader' ) ); + $wgOut->wrapWikiMsg( "<div class=\"mw-talkpageheader\">\n$1\n</div>", array( 'talkpageheader' ) ); } } } @@ -1163,7 +1281,8 @@ class Article { * Show the footer section of an ordinary page view */ public function showViewFooter() { - global $wgOut, $wgUseTrackbacks, $wgRequest; + global $wgOut, $wgUseTrackbacks; + # check if we're displaying a [[User talk:x.x.x.x]] anonymous talk page if ( $this->mTitle->getNamespace() == NS_USER_TALK && IP::isValid( $this->mTitle->getText() ) ) { $wgOut->addWikiMsg( 'anontalkpagetext' ); @@ -1186,13 +1305,16 @@ class Article { */ public function showPatrolFooter() { global $wgOut, $wgRequest, $wgUser; + $rcid = $wgRequest->getVal( 'rcid' ); - if ( !$rcid || !$this->mTitle->exists() || !$this->mTitle->quickUserCan( 'patrol' ) ) { + if ( !$rcid || !$this->mTitle->quickUserCan( 'patrol' ) ) { return; } $sk = $wgUser->getSkin(); + $token = $wgUser->editToken( $rcid ); + $wgOut->preventClickjacking(); $wgOut->addHTML( "<div class='patrollink'>" . @@ -1204,7 +1326,8 @@ class Article { array(), array( 'action' => 'markpatrolled', - 'rcid' => $rcid + 'rcid' => $rcid, + 'token' => $token, ), array( 'known', 'noclasses' ) ) @@ -1226,8 +1349,9 @@ class Article { $rootPart = $parts[0]; $user = User::newFromName( $rootPart, false /* allow IP users*/ ); $ip = User::isIP( $rootPart ); + if ( !$user->isLoggedIn() && !$ip ) { # User does not exist - $wgOut->wrapWikiMsg( "<div class=\"mw-userpage-userdoesnotexist error\">\n\$1</div>", + $wgOut->wrapWikiMsg( "<div class=\"mw-userpage-userdoesnotexist error\">\n\$1\n</div>", array( 'userpage-userdoesnotexist-view', $rootPart ) ); } else if ( $user->isBlocked() ) { # Show log extract if the user is currently blocked LogEventsList::showLogExtract( @@ -1246,7 +1370,9 @@ class Article { ); } } + wfRunHooks( 'ShowMissingArticle', array( $this ) ); + # Show delete and move logs LogEventsList::showLogExtract( $wgOut, array( 'delete', 'move' ), $this->mTitle->getPrefixedText(), '', array( 'lim' => 10, @@ -1269,35 +1395,42 @@ class Article { $editErrors = $this->mTitle->getUserPermissionsErrors( 'edit', $wgUser ); $errors = array_merge( $createErrors, $editErrors ); - if ( !count( $errors ) ) + if ( !count( $errors ) ) { $text = wfMsgNoTrans( 'noarticletext' ); - else + } else { $text = wfMsgNoTrans( 'noarticletext-nopermission' ); + } } $text = "<div class='noarticletext'>\n$text\n</div>"; + if ( !$this->hasViewableContent() ) { // If there's no backing content, send a 404 Not Found // for better machine handling of broken links. - $wgRequest->response()->header( "HTTP/1.x 404 Not Found" ); + $wgRequest->response()->header( "HTTP/1.1 404 Not Found" ); } + $wgOut->addWikiText( $text ); } /** * If the revision requested for view is deleted, check permissions. * Send either an error message or a warning header to $wgOut. - * Returns true if the view is allowed, false if not. + * + * @return boolean true if the view is allowed, false if not. */ public function showDeletedRevisionHeader() { global $wgOut, $wgRequest; + if ( !$this->mRevision->isDeleted( Revision::DELETED_TEXT ) ) { // Not deleted return true; } + // If the user is not allowed to see it... if ( !$this->mRevision->userCan( Revision::DELETED_TEXT ) ) { - $wgOut->wrapWikiMsg( "<div class='mw-warning plainlinks'>\n$1</div>\n", + $wgOut->wrapWikiMsg( "<div class='mw-warning plainlinks'>\n$1\n</div>\n", 'rev-deleted-text-permission' ); + return false; // If the user needs to confirm that they want to see it... } else if ( $wgRequest->getInt( 'unhide' ) != 1 ) { @@ -1306,26 +1439,30 @@ class Article { $link = $this->mTitle->getFullUrl( "oldid={$oldid}&unhide=1" ); $msg = $this->mRevision->isDeleted( Revision::DELETED_RESTRICTED ) ? 'rev-suppressed-text-unhide' : 'rev-deleted-text-unhide'; - $wgOut->wrapWikiMsg( "<div class='mw-warning plainlinks'>\n$1</div>\n", + $wgOut->wrapWikiMsg( "<div class='mw-warning plainlinks'>\n$1\n</div>\n", array( $msg, $link ) ); + return false; // We are allowed to see... } else { $msg = $this->mRevision->isDeleted( Revision::DELETED_RESTRICTED ) ? 'rev-suppressed-text-view' : 'rev-deleted-text-view'; - $wgOut->wrapWikiMsg( "<div class='mw-warning plainlinks'>\n$1</div>\n", $msg ); + $wgOut->wrapWikiMsg( "<div class='mw-warning plainlinks'>\n$1\n</div>\n", $msg ); + return true; } } - /* - * Should the parser cache be used? - */ + /** + * Should the parser cache be used? + * + * @return boolean + */ public function useParserCache( $oldid ) { global $wgUser, $wgEnableParserCache; return $wgEnableParserCache - && intval( $wgUser->getOption( 'stubthreshold' ) ) == 0 + && $wgUser->getStubThreshold() == 0 && $this->exists() && empty( $oldid ) && !$this->mTitle->isCssOrJsPage() @@ -1337,15 +1474,22 @@ class Article { */ public function doViewParse() { global $wgOut; + $oldid = $this->getOldID(); - $useParserCache = $this->useParserCache( $oldid ); - $parserOptions = clone $this->getParserOptions(); + $parserOptions = $this->getParserOptions(); + # Render printable version, use printable version cache $parserOptions->setIsPrintable( $wgOut->isPrintable() ); + # Don't show section-edit links on old revisions... this way lies madness. - $parserOptions->setEditSection( $this->isCurrent() ); + if ( !$this->isCurrent() || $wgOut->isPrintable() || !$this->mTitle->quickUserCan( 'edit' ) ) { + $parserOptions->setEditSection( false ); + } + $useParserCache = $this->useParserCache( $oldid ); $this->outputWikiText( $this->getContent(), $useParserCache, $parserOptions ); + + return true; } /** @@ -1353,13 +1497,21 @@ class Article { * output it and return true. If it is not present, output nothing and * return false. This is used as a callback function for * PoolCounter::executeProtected(). + * + * @return boolean */ public function tryDirtyCache() { global $wgOut; $parserCache = ParserCache::singleton(); $options = $this->getParserOptions(); - $options->setIsPrintable( $wgOut->isPrintable() ); + + if ( $wgOut->isPrintable() ) { + $options->setIsPrintable( true ); + $options->setEditSection( false ); + } + $output = $parserCache->getDirty( $this, $options ); + if ( $output ) { wfDebug( __METHOD__ . ": sending dirty output\n" ); wfDebugLog( 'dirty', "dirty output " . $parserCache->getKey( $this, $options ) . "\n" ); @@ -1367,126 +1519,123 @@ class Article { $this->mParserOutput = $output; $wgOut->addParserOutput( $output ); $wgOut->addHTML( "<!-- parser cache is expired, sending anyway due to pool overload-->\n" ); + return true; } else { wfDebugLog( 'dirty', "dirty missing\n" ); wfDebug( __METHOD__ . ": no dirty cache\n" ); + return false; } } /** - * Show an error page for an error from the pool counter. - * @param $status Status - */ - public function showPoolError( $status ) { - global $wgOut; - $wgOut->clearHTML(); // for release() errors - $wgOut->enableClientCache( false ); - $wgOut->setRobotPolicy( 'noindex,nofollow' ); - $wgOut->addWikiText( - '<div class="errorbox">' . - $status->getWikiText( false, 'view-pool-error' ) . - '</div>' - ); - } - - /** * View redirect + * * @param $target Title object or Array of destination(s) to redirect * @param $appendSubtitle Boolean [optional] * @param $forceKnown Boolean: should the image be shown as a bluelink regardless of existence? + * @return string containing HMTL with redirect link */ public function viewRedirect( $target, $appendSubtitle = true, $forceKnown = false ) { global $wgOut, $wgContLang, $wgStylePath, $wgUser; - # Display redirect + if ( !is_array( $target ) ) { $target = array( $target ); } + $imageDir = $wgContLang->getDir(); - $imageUrl = $wgStylePath . '/common/images/redirect' . $imageDir . '.png'; - $imageUrl2 = $wgStylePath . '/common/images/nextredirect' . $imageDir . '.png'; - $alt2 = $wgContLang->isRTL() ? '←' : '→'; // should -> and <- be used instead of entities? if ( $appendSubtitle ) { $wgOut->appendSubtitle( wfMsgHtml( 'redirectpagesub' ) ); } + $sk = $wgUser->getSkin(); // the loop prepends the arrow image before the link, so the first case needs to be outside $title = array_shift( $target ); + if ( $forceKnown ) { - $link = $sk->link( - $title, - htmlspecialchars( $title->getFullText() ), - array(), - array(), - array( 'known', 'noclasses' ) - ); + $link = $sk->linkKnown( $title, htmlspecialchars( $title->getFullText() ) ); } else { $link = $sk->link( $title, htmlspecialchars( $title->getFullText() ) ); } - // automatically append redirect=no to each link, since most of them are redirect pages themselves + + $nextRedirect = $wgStylePath . '/common/images/nextredirect' . $imageDir . '.png'; + $alt = $wgContLang->isRTL() ? '←' : '→'; + // Automatically append redirect=no to each link, since most of them are redirect pages themselves. + // FIXME: where this happens? foreach ( $target as $rt ) { + $link .= Html::element( 'img', array( 'src' => $nextRedirect, 'alt' => $alt ) ); if ( $forceKnown ) { - $link .= '<img src="' . $imageUrl2 . '" alt="' . $alt2 . ' " />' - . $sk->link( - $rt, - htmlspecialchars( $rt->getFullText() ), - array(), - array(), - array( 'known', 'noclasses' ) - ); + $link .= $sk->linkKnown( $rt, htmlspecialchars( $rt->getFullText() ) ); } else { - $link .= '<img src="' . $imageUrl2 . '" alt="' . $alt2 . ' " />' - . $sk->link( $rt, htmlspecialchars( $rt->getFullText() ) ); + $link .= $sk->link( $rt, htmlspecialchars( $rt->getFullText() ) ); } } - return '<img src="' . $imageUrl . '" alt="#REDIRECT " />' . - '<span class="redirectText">' . $link . '</span>'; + $imageUrl = $wgStylePath . '/common/images/redirect' . $imageDir . '.png'; + return '<div class="redirectMsg">' . + Html::element( 'img', array( 'src' => $imageUrl, 'alt' => '#REDIRECT' ) ) . + '<span class="redirectText">' . $link . '</span></div>'; } + /** + * Builds trackback links for article display if $wgUseTrackbacks is set to true + */ public function addTrackbacks() { global $wgOut, $wgUser; + $dbr = wfGetDB( DB_SLAVE ); $tbs = $dbr->select( 'trackbacks', array( 'tb_id', 'tb_title', 'tb_url', 'tb_ex', 'tb_name' ), array( 'tb_page' => $this->getID() ) ); - if ( !$dbr->numRows( $tbs ) ) return; + + if ( !$dbr->numRows( $tbs ) ) { + return; + } $wgOut->preventClickjacking(); $tbtext = ""; - while ( $o = $dbr->fetchObject( $tbs ) ) { + foreach ( $tbs as $o ) { $rmvtxt = ""; + if ( $wgUser->isAllowed( 'trackback' ) ) { $delurl = $this->mTitle->getFullURL( "action=deletetrackback&tbid=" . $o->tb_id . "&token=" . urlencode( $wgUser->editToken() ) ); $rmvtxt = wfMsg( 'trackbackremove', htmlspecialchars( $delurl ) ); } + $tbtext .= "\n"; - $tbtext .= wfMsg( strlen( $o->tb_ex ) ? 'trackbackexcerpt' : 'trackback', + $tbtext .= wfMsgNoTrans( strlen( $o->tb_ex ) ? 'trackbackexcerpt' : 'trackback', $o->tb_title, $o->tb_url, $o->tb_ex, $o->tb_name, $rmvtxt ); } - $wgOut->wrapWikiMsg( "<div id='mw_trackbacks'>$1</div>\n", array( 'trackbackbox', $tbtext ) ); - $this->mTitle->invalidateCache(); + + $wgOut->wrapWikiMsg( "<div id='mw_trackbacks'>\n$1\n</div>\n", array( 'trackbackbox', $tbtext ) ); } + /** + * Removes trackback record for current article from trackbacks table + */ public function deletetrackback() { global $wgUser, $wgRequest, $wgOut; + if ( !$wgUser->matchEditToken( $wgRequest->getVal( 'token' ) ) ) { $wgOut->addWikiMsg( 'sessionfailure' ); + return; } $permission_errors = $this->mTitle->getUserPermissionsErrors( 'delete', $wgUser ); + if ( count( $permission_errors ) ) { $wgOut->showPermissionsErrorPage( $permission_errors ); + return; } @@ -1497,8 +1646,13 @@ class Article { $this->mTitle->invalidateCache(); } + /** + * Handle action=render + */ + public function render() { global $wgOut; + $wgOut->setArticleBodyOnly( true ); $this->view(); } @@ -1508,22 +1662,30 @@ class Article { */ public function purge() { global $wgUser, $wgRequest, $wgOut; + if ( $wgUser->isAllowed( 'purge' ) || $wgRequest->wasPosted() ) { + //FIXME: shouldn't this be in doPurge()? if ( wfRunHooks( 'ArticlePurge', array( &$this ) ) ) { $this->doPurge(); $this->view(); } } else { - $action = htmlspecialchars( $wgRequest->getRequestURL() ); - $button = wfMsgExt( 'confirm_purge_button', array( 'escapenoentities' ) ); - $form = "<form method=\"post\" action=\"$action\">\n" . - "<input type=\"submit\" name=\"submit\" value=\"$button\" />\n" . - "</form>\n"; - $top = wfMsgExt( 'confirm-purge-top', array( 'parse' ) ); - $bottom = wfMsgExt( 'confirm-purge-bottom', array( 'parse' ) ); + $formParams = array( + 'method' => 'post', + 'action' => $wgRequest->getRequestURL(), + ); + + $wgOut->addWikiMsg( 'confirm-purge-top' ); + + $form = Html::openElement( 'form', $formParams ); + $form .= Xml::submitButton( wfMsg( 'confirm_purge_button' ) ); + $form .= Html::closeElement( 'form' ); + + $wgOut->addHTML( $form ); + $wgOut->addWikiMsg( 'confirm-purge-bottom' ); + $wgOut->setPageTitle( $this->mTitle->getPrefixedText() ); $wgOut->setRobotPolicy( 'noindex,nofollow' ); - $wgOut->addHTML( $top . $form . $bottom ); } } @@ -1532,6 +1694,7 @@ class Article { */ public function doPurge() { global $wgUseSquid; + // Invalidate the cache $this->mTitle->invalidateCache(); @@ -1544,13 +1707,16 @@ class Article { $update = SquidUpdate::newSimplePurge( $this->mTitle ); $update->doUpdate(); } + if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) { global $wgMessageCache; + if ( $this->getID() == 0 ) { $text = false; } else { $text = $this->getRawText(); } + $wgMessageCache->replace( $this->mTitle->getDBkey(), $text ); } } @@ -1558,7 +1724,7 @@ class Article { /** * Insert a new empty page record for this article. * This *must* be followed up by creating a revision - * and running $this->updateToLatest( $rev_id ); + * and running $this->updateRevisionOn( ... ); * or else the record will be left in a funky state. * Best if all done inside a transaction. * @@ -1585,18 +1751,20 @@ class Article { ), __METHOD__, 'IGNORE' ); $affected = $dbw->affectedRows(); + if ( $affected ) { $newid = $dbw->insertId(); $this->mTitle->resetArticleId( $newid ); } wfProfileOut( __METHOD__ ); + return $affected ? $newid : false; } /** * Update the page record to point to a newly saved revision. * - * @param $dbw Database object + * @param $dbw DatabaseBase: object * @param $revision Revision: For ID number, and text used to set length and redirect status fields * @param $lastRevision Integer: if given, will not overwrite the page field @@ -1612,9 +1780,10 @@ class Article { wfProfileIn( __METHOD__ ); $text = $revision->getText(); - $rt = Title::newFromRedirect( $text ); + $rt = Title::newFromRedirectRecurse( $text ); $conditions = array( 'page_id' => $this->getId() ); + if ( !is_null( $lastRevision ) ) { # An extra check against threads stepping on each other $conditions['page_latest'] = $lastRevision; @@ -1656,27 +1825,25 @@ class Article { // Update/Insert if we don't know if the last revision was a redirect or not // Delete if changing from redirect to non-redirect $isRedirect = !is_null( $redirectTitle ); + if ( $isRedirect || is_null( $lastRevIsRedirect ) || $lastRevIsRedirect !== $isRedirect ) { wfProfileIn( __METHOD__ ); if ( $isRedirect ) { - // This title is a redirect, Add/Update row in the redirect table - $set = array( /* SET */ - 'rd_namespace' => $redirectTitle->getNamespace(), - 'rd_title' => $redirectTitle->getDBkey(), - 'rd_from' => $this->getId(), - ); - $dbw->replace( 'redirect', array( 'rd_from' ), $set, __METHOD__ ); + $this->insertRedirectEntry( $redirectTitle ); } else { // This is not a redirect, remove row from redirect table $where = array( 'rd_from' => $this->getId() ); $dbw->delete( 'redirect', $where, __METHOD__ ); } + if ( $this->getTitle()->getNamespace() == NS_FILE ) { RepoGroup::singleton()->getLocalRepo()->invalidateImageRedirect( $this->getTitle() ); } wfProfileOut( __METHOD__ ); + return ( $dbw->affectedRows() != 0 ); } + return true; } @@ -1686,9 +1853,11 @@ class Article { * * @param $dbw Database object * @param $revision Revision object + * @return mixed */ public function updateIfNewerOn( &$dbw, $revision ) { wfProfileIn( __METHOD__ ); + $row = $dbw->selectRow( array( 'revision', 'page' ), array( 'rev_id', 'rev_timestamp', 'page_is_redirect' ), @@ -1696,6 +1865,7 @@ class Article { 'page_id' => $this->getId(), 'page_latest=rev_id' ), __METHOD__ ); + if ( $row ) { if ( wfTimestamp( TS_MW, $row->rev_timestamp ) >= $revision->getTimestamp() ) { wfProfileOut( __METHOD__ ); @@ -1708,17 +1878,23 @@ class Article { $prev = 0; $lastRevIsRedirect = null; } + $ret = $this->updateRevisionOn( $dbw, $revision, $prev, $lastRevIsRedirect ); + wfProfileOut( __METHOD__ ); return $ret; } /** * @param $section empty/null/false or a section number (0, 1, 2, T1, T2...) + * @param $text String: new text of the section + * @param $summary String: new section's subject, only if $section is 'new' + * @param $edittime String: revision timestamp or null to use the current revision * @return string Complete article text, or null if error */ public function replaceSection( $section, $text, $summary = '', $edittime = null ) { wfProfileIn( __METHOD__ ); + if ( strval( $section ) == '' ) { // Whole-page edit; let the whole text through } else { @@ -1728,11 +1904,14 @@ class Article { $dbw = wfGetDB( DB_MASTER ); $rev = Revision::loadFromTimestamp( $dbw, $this->mTitle, $edittime ); } + if ( !$rev ) { wfDebug( "Article::replaceSection asked for bogus section (page: " . $this->getId() . "; section: $section; edittime: $edittime)\n" ); + wfProfileOut( __METHOD__ ); return null; } + $oldtext = $rev->getText(); if ( $section == 'new' ) { @@ -1744,9 +1923,11 @@ class Article { } else { # Replacing an existing section; roll out the big guns global $wgParser; + $text = $wgParser->replaceSection( $oldtext, $section, $text ); } } + wfProfileOut( __METHOD__ ); return $text; } @@ -1765,7 +1946,6 @@ class Article { if ( $comment && $summary != "" ) { $text = wfMsgForContent( 'newsectionheaderdefaultlevel', $summary ) . "\n\n" . $text; } - $this->doEdit( $text, $summary, $flags ); $dbw = wfGetDB( DB_MASTER ); @@ -1794,6 +1974,7 @@ class Article { ( $forceBot ? EDIT_FORCE_BOT : 0 ); $status = $this->doEdit( $text, $summary, $flags ); + if ( !$status->isOK() ) { return false; } @@ -1821,6 +2002,23 @@ class Article { } /** + * Check flags and add EDIT_NEW or EDIT_UPDATE to them as needed. + * @param $flags Int + * @return Int updated $flags + */ + function checkFlags( $flags ) { + if ( !( $flags & EDIT_NEW ) && !( $flags & EDIT_UPDATE ) ) { + if ( $this->mTitle->getArticleID() ) { + $flags |= EDIT_UPDATE; + } else { + $flags |= EDIT_NEW; + } + } + + return $flags; + } + + /** * Article::doEdit() * * Change an existing article or create a new article. Updates RC and all necessary caches, @@ -1874,7 +2072,7 @@ class Article { global $wgUser, $wgDBtransactions, $wgUseAutomaticEditSummaries; # Low-level sanity check - if ( $this->mTitle->getText() == '' ) { + if ( $this->mTitle->getText() === '' ) { throw new MWException( 'Something is trying to edit an article with an empty title' ); } @@ -1886,23 +2084,18 @@ class Article { # Load $this->mTitle->getArticleID() and $this->mLatest if it's not already $this->loadPageData(); - if ( !( $flags & EDIT_NEW ) && !( $flags & EDIT_UPDATE ) ) { - $aid = $this->mTitle->getArticleID(); - if ( $aid ) { - $flags |= EDIT_UPDATE; - } else { - $flags |= EDIT_NEW; - } - } + $flags = $this->checkFlags( $flags ); if ( !wfRunHooks( 'ArticleSave', array( &$this, &$user, &$text, &$summary, $flags & EDIT_MINOR, null, null, &$flags, &$status ) ) ) { wfDebug( __METHOD__ . ": ArticleSave hook aborted save!\n" ); - wfProfileOut( __METHOD__ ); + if ( $status->isOK() ) { $status->fatal( 'edit-hook-aborted' ); } + + wfProfileOut( __METHOD__ ); return $status; } @@ -1929,13 +2122,12 @@ class Article { if ( $flags & EDIT_UPDATE ) { # Update article, but only if changed. $status->value['new'] = false; + # Make sure the revision is either completely inserted or not inserted at all if ( !$wgDBtransactions ) { $userAbort = ignore_user_abort( true ); } - $revisionId = 0; - $changed = ( strcmp( $text, $oldtext ) != 0 ); if ( $changed ) { @@ -1947,6 +2139,7 @@ class Article { # Article gone missing wfDebug( __METHOD__ . ": EDIT_UPDATE specified but article doesn't exist\n" ); $status->fatal( 'edit-gone-missing' ); + wfProfileOut( __METHOD__ ); return $status; } @@ -1959,7 +2152,7 @@ class Article { 'parent_id' => $this->mLatest, 'user' => $user->getId(), 'user_text' => $user->getName(), - ) ); + ) ); $dbw->begin(); $revisionId = $revision->insertOn( $dbw ); @@ -1976,10 +2169,12 @@ class Article { if ( !$ok ) { /* Belated edit conflict! Run away!! */ $status->fatal( 'edit-conflict' ); + # Delete the invalid revision if the DB is not transactional if ( !$wgDBtransactions ) { $dbw->delete( 'revision', array( 'rev_id' => $revisionId ), __METHOD__ ); } + $revisionId = 0; $dbw->rollback(); } else { @@ -1994,6 +2189,7 @@ class Article { $this->mLatest, $this->getTimestamp(), $bot, '', $oldsize, $newsize, $revisionId, $patrolled ); + # Log auto-patrolled edits if ( $patrolled ) { PatrolLog::record( $rc, true ); @@ -2015,6 +2211,7 @@ class Article { if ( !$wgDBtransactions ) { ignore_user_abort( $userAbort ); } + // Now that ignore_user_abort is restored, we can respond to fatal errors if ( !$status->isOK() ) { wfProfileOut( __METHOD__ ); @@ -2045,6 +2242,7 @@ class Article { if ( $newid === false ) { $dbw->rollback(); $status->fatal( 'edit-already-exists' ); + wfProfileOut( __METHOD__ ); return $status; } @@ -2066,14 +2264,17 @@ class Article { $this->updateRevisionOn( $dbw, $revision, 0 ); wfRunHooks( 'NewRevisionFromEditComplete', array( $this, $revision, false, $user ) ); + # Update recentchanges if ( !( $flags & EDIT_SUPPRESS_RC ) ) { global $wgUseRCPatrol, $wgUseNPPatrol; + # Mark as patrolled if the user can do so $patrolled = ( $wgUseRCPatrol || $wgUseNPPatrol ) && $this->mTitle->userCan( 'autopatrol' ); # Add RC row to the DB $rc = RecentChange::notifyNew( $now, $this->mTitle, $isminor, $user, $summary, $bot, '', strlen( $text ), $revisionId, $patrolled ); + # Log auto-patrolled edits if ( $patrolled ) { PatrolLog::record( $rc, true ); @@ -2125,13 +2326,15 @@ class Article { */ public function doRedirect( $noRedir = false, $sectionAnchor = '', $extraQuery = '' ) { global $wgOut; + if ( $noRedir ) { $query = 'redirect=no'; if ( $extraQuery ) - $query .= "&$query"; + $query .= "&$extraQuery"; } else { $query = $extraQuery; } + $wgOut->redirect( $this->mTitle->getFullURL( $query ) . $sectionAnchor ); } @@ -2139,12 +2342,20 @@ class Article { * Mark this particular edit/page as patrolled */ public function markpatrolled() { - global $wgOut, $wgRequest, $wgUseRCPatrol, $wgUseNPPatrol, $wgUser; + global $wgOut, $wgUser, $wgRequest; + $wgOut->setRobotPolicy( 'noindex,nofollow' ); # If we haven't been given an rc_id value, we can't do anything $rcid = (int) $wgRequest->getVal( 'rcid' ); + + if ( !$wgUser->matchEditToken( $wgRequest->getVal( 'token' ), $rcid ) ) { + $wgOut->showErrorPage( 'sessionfailure-title', 'sessionfailure' ); + return; + } + $rc = RecentChange::newFromId( $rcid ); + if ( is_null( $rc ) ) { $wgOut->showErrorPage( 'markedaspatrollederror', 'markedaspatrollederrortext' ); return; @@ -2154,11 +2365,11 @@ class Article { $returnto = $rc->getAttribute( 'rc_type' ) == RC_NEW ? 'Newpages' : 'Recentchanges'; $return = SpecialPage::getTitleFor( $returnto ); - $dbw = wfGetDB( DB_MASTER ); $errors = $rc->doMarkPatrolled(); if ( in_array( array( 'rcpatroldisabled' ), $errors ) ) { $wgOut->showErrorPage( 'rcpatroldisabled', 'rcpatroldisabledtext' ); + return; } @@ -2171,11 +2382,13 @@ class Article { $wgOut->setPageTitle( wfMsg( 'markedaspatrollederror' ) ); $wgOut->addWikiMsg( 'markedaspatrollederror-noautopatrol' ); $wgOut->returnToMain( false, $return ); + return; } if ( !empty( $errors ) ) { $wgOut->showPermissionsErrorPage( $errors ); + return; } @@ -2190,35 +2403,45 @@ class Article { */ public function watch() { global $wgUser, $wgOut; + if ( $wgUser->isAnon() ) { $wgOut->showErrorPage( 'watchnologin', 'watchnologintext' ); return; } + if ( wfReadOnly() ) { $wgOut->readOnlyPage(); return; } + if ( $this->doWatch() ) { $wgOut->setPagetitle( wfMsg( 'addedwatch' ) ); $wgOut->setRobotPolicy( 'noindex,nofollow' ); $wgOut->addWikiMsg( 'addedwatchtext', $this->mTitle->getPrefixedText() ); } + $wgOut->returnToMain( true, $this->mTitle->getPrefixedText() ); } /** * Add this page to $wgUser's watchlist + * + * This is safe to be called multiple times + * * @return bool true on successful watch operation */ public function doWatch() { global $wgUser; + if ( $wgUser->isAnon() ) { return false; } + if ( wfRunHooks( 'WatchArticle', array( &$wgUser, &$this ) ) ) { $wgUser->addWatch( $this->mTitle ); return wfRunHooks( 'WatchArticleComplete', array( &$wgUser, &$this ) ); } + return false; } @@ -2227,19 +2450,23 @@ class Article { */ public function unwatch() { global $wgUser, $wgOut; + if ( $wgUser->isAnon() ) { $wgOut->showErrorPage( 'watchnologin', 'watchnologintext' ); return; } + if ( wfReadOnly() ) { $wgOut->readOnlyPage(); return; } + if ( $this->doUnwatch() ) { $wgOut->setPagetitle( wfMsg( 'removedwatch' ) ); $wgOut->setRobotPolicy( 'noindex,nofollow' ); $wgOut->addWikiMsg( 'removedwatchtext', $this->mTitle->getPrefixedText() ); } + $wgOut->returnToMain( true, $this->mTitle->getPrefixedText() ); } @@ -2249,13 +2476,16 @@ class Article { */ public function doUnwatch() { global $wgUser; + if ( $wgUser->isAnon() ) { return false; } + if ( wfRunHooks( 'UnwatchArticle', array( &$wgUser, &$this ) ) ) { $wgUser->removeWatch( $this->mTitle ); return wfRunHooks( 'UnwatchArticleComplete', array( &$wgUser, &$this ) ); } + return false; } @@ -2289,8 +2519,9 @@ class Article { $restrictionTypes = $this->mTitle->getRestrictionTypes(); $id = $this->mTitle->getArticleID(); + if ( $id <= 0 ) { - wfDebug( "updateRestrictions failed: $id <= 0\n" ); + wfDebug( "updateRestrictions failed: article id $id <= 0\n" ); return false; } @@ -2316,6 +2547,7 @@ class Article { $current = array(); $updated = Article::flattenRestrictions( $limit ); $changed = false; + foreach ( $restrictionTypes as $action ) { if ( isset( $expiry[$action] ) ) { # Get current restrictions on $action @@ -2323,6 +2555,7 @@ class Article { $current[$action] = implode( '', $aLimits ); # Are any actual restrictions being dealt with here? $aRChanged = count( $aLimits ) || !empty( $limit[$action] ); + # If something changed, we need to log it. Checking $aRChanged # assures that "unprotecting" a page that is not protected does # not log just because the expiry was "changed". @@ -2341,38 +2574,44 @@ class Article { # If nothing's changed, do nothing if ( $changed ) { if ( wfRunHooks( 'ArticleProtect', array( &$this, &$wgUser, $limit, $reason ) ) ) { - $dbw = wfGetDB( DB_MASTER ); # Prepare a null revision to be added to the history $modified = $current != '' && $protect; + if ( $protect ) { $comment_type = $modified ? 'modifiedarticleprotection' : 'protectedarticle'; } else { $comment_type = 'unprotectedarticle'; } + $comment = $wgContLang->ucfirst( wfMsgForContent( $comment_type, $this->mTitle->getPrefixedText() ) ); # Only restrictions with the 'protect' right can cascade... # Otherwise, people who cannot normally protect can "protect" pages via transclusion $editrestriction = isset( $limit['edit'] ) ? array( $limit['edit'] ) : $this->mTitle->getRestrictions( 'edit' ); + # The schema allows multiple restrictions - if ( !in_array( 'protect', $editrestriction ) && !in_array( 'sysop', $editrestriction ) ) + if ( !in_array( 'protect', $editrestriction ) && !in_array( 'sysop', $editrestriction ) ) { $cascade = false; + } + $cascade_description = ''; + if ( $cascade ) { $cascade_description = ' [' . wfMsgForContent( 'protect-summary-cascade' ) . ']'; } - if ( $reason ) + if ( $reason ) { $comment .= ": $reason"; + } $editComment = $comment; $encodedExpiry = array(); $protect_description = ''; - foreach ( $limit as $action => $restrictions ) { + foreach ( $limit as $action => $restrictions ) { if ( !isset( $expiry[$action] ) ) - $expiry[$action] = 'infinite'; + $expiry[$action] = Block::infinity(); $encodedExpiry[$action] = Block::encodeExpiry( $expiry[$action], $dbw ); if ( $restrictions != '' ) { @@ -2385,15 +2624,20 @@ class Article { } else { $protect_description .= wfMsgForContent( 'protect-expiry-indefinite' ); } + $protect_description .= ') '; } } $protect_description = trim( $protect_description ); - if ( $protect_description && $protect ) + if ( $protect_description && $protect ) { $editComment .= " ($protect_description)"; - if ( $cascade ) + } + + if ( $cascade ) { $editComment .= "$cascade_description"; + } + # Update restrictions table foreach ( $limit as $action => $restrictions ) { if ( $restrictions != '' ) { @@ -2402,7 +2646,10 @@ class Article { 'pr_type' => $action, 'pr_level' => $restrictions, 'pr_cascade' => ( $cascade && $action == 'edit' ) ? 1 : 0, - 'pr_expiry' => $encodedExpiry[$action] ), __METHOD__ ); + 'pr_expiry' => $encodedExpiry[$action] + ), + __METHOD__ + ); } else { $dbw->delete( 'page_restrictions', array( 'pr_page' => $id, 'pr_type' => $action ), __METHOD__ ); @@ -2436,7 +2683,6 @@ class Article { } else { $log->addEntry( 'unprotect', $this->mTitle, $reason ); } - } # End hook } # End "changed" check @@ -2453,35 +2699,46 @@ class Article { if ( !is_array( $limit ) ) { throw new MWException( 'Article::flattenRestrictions given non-array restriction set' ); } + $bits = array(); ksort( $limit ); + foreach ( $limit as $action => $restrictions ) { if ( $restrictions != '' ) { $bits[] = "$action=$restrictions"; } } + return implode( ':', $bits ); } /** * Auto-generates a deletion reason + * * @param &$hasHistory Boolean: whether the page has a history + * @return mixed String containing deletion reason or empty string, or boolean false + * if no revision occurred */ public function generateReason( &$hasHistory ) { global $wgContLang; + $dbw = wfGetDB( DB_MASTER ); // Get the last revision $rev = Revision::newFromTitle( $this->mTitle ); - if ( is_null( $rev ) ) + + if ( is_null( $rev ) ) { return false; + } // Get the article's contents $contents = $rev->getText(); $blank = false; + // If the page is blank, use the text from the previous revision, // which can only be blank if there's a move/import/protect dummy revision involved if ( $contents == '' ) { $prev = $rev->getPrevious(); + if ( $prev ) { $contents = $prev->getText(); $blank = true; @@ -2495,21 +2752,27 @@ class Article { __METHOD__, array( 'LIMIT' => 20 ) ); - if ( $res === false ) + + if ( $res === false ) { // This page has no revisions, which is very weird return false; + } $hasHistory = ( $res->numRows() > 1 ); $row = $dbw->fetchObject( $res ); - $onlyAuthor = $row->rev_user_text; - // Try to find a second contributor - foreach ( $res as $row ) { - if ( $row->rev_user_text != $onlyAuthor ) { - $onlyAuthor = false; - break; + + if ( $row ) { // $row is false if the only contributor is hidden + $onlyAuthor = $row->rev_user_text; + // Try to find a second contributor + foreach ( $res as $row ) { + if ( $row->rev_user_text != $onlyAuthor ) { // Bug 22999 + $onlyAuthor = false; + break; + } } + } else { + $onlyAuthor = false; } - $dbw->freeResult( $res ); // Generate the summary with a '$1' placeholder if ( $blank ) { @@ -2517,10 +2780,11 @@ class Article { // blank. It's just not our lucky day $reason = wfMsgForContent( 'exbeforeblank', '$1' ); } else { - if ( $onlyAuthor ) + if ( $onlyAuthor ) { $reason = wfMsgForContent( 'excontentauthor', '$1', $onlyAuthor ); - else + } else { $reason = wfMsgForContent( 'excontent', '$1' ); + } } if ( $reason == '-' ) { @@ -2538,6 +2802,7 @@ class Article { $contents = preg_replace( '/\[\[([^\]]*)\]?$/', '$1', $contents ); // Now replace the '$1' placeholder $reason = str_replace( '$1', $contents, $reason ); + return $reason; } @@ -2562,6 +2827,7 @@ class Article { } elseif ( $reason == 'other' ) { $reason = $this->DeleteReason; } + # Flag to hide all contents of the archived revisions $suppress = $wgRequest->getVal( 'wpSuppress' ) && $wgUser->isAllowed( 'suppressrevision' ); @@ -2570,6 +2836,7 @@ class Article { # Read-only check... if ( wfReadOnly() ) { $wgOut->readOnlyPage(); + return; } @@ -2578,6 +2845,7 @@ class Article { if ( count( $permission_errors ) > 0 ) { $wgOut->showPermissionsErrorPage( $permission_errors ); + return; } @@ -2601,6 +2869,7 @@ class Article { 'delete', $this->mTitle->getPrefixedText() ); + return; } @@ -2608,38 +2877,47 @@ class Article { $bigHistory = $this->isBigDeletion(); if ( $bigHistory && !$this->mTitle->userCan( 'bigdelete' ) ) { global $wgLang, $wgDeleteRevisionsLimit; - $wgOut->wrapWikiMsg( "<div class='error'>\n$1</div>\n", + + $wgOut->wrapWikiMsg( "<div class='error'>\n$1\n</div>\n", array( 'delete-toobig', $wgLang->formatNum( $wgDeleteRevisionsLimit ) ) ); + return; } if ( $confirm ) { $this->doDelete( $reason, $suppress ); + if ( $wgRequest->getCheck( 'wpWatch' ) && $wgUser->isLoggedIn() ) { $this->doWatch(); } elseif ( $this->mTitle->userIsWatching() ) { $this->doUnwatch(); } + return; } // Generate deletion reason $hasHistory = false; - if ( !$reason ) $reason = $this->generateReason( $hasHistory ); + if ( !$reason ) { + $reason = $this->generateReason( $hasHistory ); + } // If the page has a history, insert a warning if ( $hasHistory && !$confirm ) { global $wgLang; + $skin = $wgUser->getSkin(); $revisions = $this->estimateRevisionCount(); + //FIXME: lego $wgOut->addHTML( '<strong class="mw-delete-warning-revisions">' . wfMsgExt( 'historywarning', array( 'parseinline' ), $wgLang->formatNum( $revisions ) ) . wfMsgHtml( 'word-separator' ) . $skin->historyLink() . '</strong>' ); + if ( $bigHistory ) { global $wgDeleteRevisionsLimit; - $wgOut->wrapWikiMsg( "<div class='error'>\n$1</div>\n", + $wgOut->wrapWikiMsg( "<div class='error'>\n$1\n</div>\n", array( 'delete-warning-toobig', $wgLang->formatNum( $wgDeleteRevisionsLimit ) ) ); } } @@ -2652,10 +2930,13 @@ class Article { */ public function isBigDeletion() { global $wgDeleteRevisionsLimit; + if ( $wgDeleteRevisionsLimit ) { $revCount = $this->estimateRevisionCount(); + return $revCount > $wgDeleteRevisionsLimit; } + return false; } @@ -2664,6 +2945,7 @@ class Article { */ public function estimateRevisionCount() { $dbr = wfGetDB( DB_SLAVE ); + // For an exact count... // return $dbr->selectField( 'revision', 'COUNT(*)', // array( 'rev_page' => $this->getId() ), __METHOD__ ); @@ -2683,6 +2965,7 @@ class Article { // If that doesn't have the latest revision, try the master $continue = 2; $db = wfGetDB( DB_SLAVE ); + do { $res = $db->select( array( 'page', 'revision' ), array( 'rev_id', 'rev_user_text' ), @@ -2695,11 +2978,14 @@ class Article { 'LIMIT' => $num ) ) ); + if ( !$res ) { wfProfileOut( __METHOD__ ); return array(); } + $row = $db->fetchObject( $res ); + if ( $continue == 2 && $revLatest && $row->rev_id != $revLatest ) { $db = wfGetDB( DB_MASTER ); $continue--; @@ -2709,15 +2995,18 @@ class Article { } while ( $continue ); $authors = array( $row->rev_user_text ); - while ( $row = $db->fetchObject( $res ) ) { + + foreach ( $res as $row ) { $authors[] = $row->rev_user_text; } + wfProfileOut( __METHOD__ ); return $authors; } /** * Output deletion confirmation dialog + * FIXME: Move to another file? * @param $reason String: prefilled reason */ public function confirmDelete( $reason ) { @@ -2725,13 +3014,7 @@ class Article { wfDebug( "Article::confirmDelete\n" ); - $deleteBackLink = $wgUser->getSkin()->link( - $this->mTitle, - null, - array(), - array(), - array( 'known', 'noclasses' ) - ); + $deleteBackLink = $wgUser->getSkin()->linkKnown( $this->mTitle ); $wgOut->setSubtitle( wfMsgHtml( 'delete-backlink', $deleteBackLink ) ); $wgOut->setRobotPolicy( 'noindex,nofollow' ); $wgOut->addWikiMsg( 'confirmdeletetext' ); @@ -2780,7 +3063,8 @@ class Article { ) ) . "</td> </tr>"; - # Dissalow watching is user is not logged in + + # Disallow watching if user is not logged in if ( $wgUser->isLoggedIn() ) { $form .= " <tr> @@ -2791,6 +3075,7 @@ class Article { "</td> </tr>"; } + $form .= " $suppress <tr> @@ -2802,7 +3087,7 @@ class Article { </tr>" . Xml::closeElement( 'table' ) . Xml::closeElement( 'fieldset' ) . - Xml::hidden( 'wpEditToken', $wgUser->editToken() ) . + Html::hidden( 'wpEditToken', $wgUser->editToken() ) . Xml::closeElement( 'form' ); if ( $wgUser->isAllowed( 'editinterface' ) ) { @@ -2819,9 +3104,7 @@ class Article { $wgOut->addHTML( $form ); $wgOut->addHTML( Xml::element( 'h2', null, LogPage::logName( 'delete' ) ) ); - LogEventsList::showLogExtract( - $wgOut, - 'delete', + LogEventsList::showLogExtract( $wgOut, 'delete', $this->mTitle->getPrefixedText() ); } @@ -2831,7 +3114,8 @@ class Article { */ public function doDelete( $reason, $suppress = false ) { global $wgOut, $wgUser; - $id = $this->mTitle->getArticleID( GAID_FOR_UPDATE ); + + $id = $this->mTitle->getArticleID( Title::GAID_FOR_UPDATE ); $error = ''; if ( wfRunHooks( 'ArticleDelete', array( &$this, &$wgUser, &$reason, &$error ) ) ) { @@ -2856,7 +3140,9 @@ class Article { wfMsgExt( 'cannotdelete', array( 'parse' ), $this->mTitle->getPrefixedText() ) ) ); + $wgOut->addHTML( Xml::element( 'h2', null, LogPage::logName( 'delete' ) ) ); + LogEventsList::showLogExtract( $wgOut, 'delete', @@ -2871,20 +3157,27 @@ class Article { /** * Back-end article deletion * Deletes the article with database consistency, writes logs, purges caches - * Returns success + * + * @param $reason string delete reason for deletion log + * @param suppress bitfield + * Revision::DELETED_TEXT + * Revision::DELETED_COMMENT + * Revision::DELETED_USER + * Revision::DELETED_RESTRICTED + * @param $id int article ID + * @param $commit boolean defaults to true, triggers transaction end + * @return boolean true if successful */ - public function doDeleteArticle( $reason, $suppress = false, $id = 0 ) { - global $wgUseSquid, $wgDeferredUpdateList; - global $wgUseTrackbacks; + public function doDeleteArticle( $reason, $suppress = false, $id = 0, $commit = true ) { + global $wgDeferredUpdateList, $wgUseTrackbacks; wfDebug( __METHOD__ . "\n" ); $dbw = wfGetDB( DB_MASTER ); - $ns = $this->mTitle->getNamespace(); $t = $this->mTitle->getDBkey(); - $id = $id ? $id : $this->mTitle->getArticleID( GAID_FOR_UPDATE ); + $id = $id ? $id : $this->mTitle->getArticleID( Title::GAID_FOR_UPDATE ); - if ( $t == '' || $id == 0 ) { + if ( $t === '' || $id == 0 ) { return false; } @@ -2942,6 +3235,7 @@ class Article { # Now that it's safely backed up, delete it $dbw->delete( 'page', array( 'page_id' => $id ), __METHOD__ ); $ok = ( $dbw->affectedRows() > 0 ); // getArticleId() uses slave, could be laggy + if ( !$ok ) { $dbw->rollback(); return false; @@ -2950,9 +3244,11 @@ class Article { # Fix category table counts $cats = array(); $res = $dbw->select( 'categorylinks', 'cl_to', array( 'cl_from' => $id ), __METHOD__ ); + foreach ( $res as $row ) { $cats [] = $row->cl_to; } + $this->updateCategoryCounts( array(), $cats ); # If using cascading deletes, we can skip some explicit deletes @@ -2969,6 +3265,7 @@ class Article { $dbw->delete( 'templatelinks', array( 'tl_from' => $id ) ); $dbw->delete( 'externallinks', array( 'el_from' => $id ) ); $dbw->delete( 'langlinks', array( 'll_from' => $id ) ); + $dbw->delete( 'iwlinks', array( 'iwl_from' => $id ) ); $dbw->delete( 'redirect', array( 'rd_from' => $id ) ); } @@ -2998,7 +3295,9 @@ class Article { # Make sure logging got through $log->addEntry( 'delete', $this->mTitle, $reason, array() ); - $dbw->commit(); + if ( $commit ) { + $dbw->commit(); + } return true; } @@ -3026,6 +3325,7 @@ class Article { */ public function doRollback( $fromP, $summary, $token, $bot, &$resultDetails ) { global $wgUser; + $resultDetails = null; # Check permissions @@ -3033,15 +3333,18 @@ class Article { $rollbackErrors = $this->mTitle->getUserPermissionsErrors( 'rollback', $wgUser ); $errors = array_merge( $editErrors, wfArrayDiff2( $rollbackErrors, $editErrors ) ); - if ( !$wgUser->matchEditToken( $token, array( $this->mTitle->getPrefixedText(), $fromP ) ) ) + if ( !$wgUser->matchEditToken( $token, array( $this->mTitle->getPrefixedText(), $fromP ) ) ) { $errors[] = array( 'sessionfailure' ); + } if ( $wgUser->pingLimiter( 'rollback' ) || $wgUser->pingLimiter() ) { $errors[] = array( 'actionthrottledtext' ); } + # If there were errors, bail out now - if ( !empty( $errors ) ) + if ( !empty( $errors ) ) { return $errors; + } return $this->commitRollback( $fromP, $summary, $bot, $resultDetails ); } @@ -3057,6 +3360,7 @@ class Article { */ public function commitRollback( $fromP, $summary, $bot, &$resultDetails ) { global $wgUseRCPatrol, $wgUser, $wgLang; + $dbw = wfGetDB( DB_MASTER ); if ( wfReadOnly() ) { @@ -3092,12 +3396,12 @@ class Article { "rev_user != {$user} OR rev_user_text != {$user_text}" ), __METHOD__, array( 'USE INDEX' => 'page_timestamp', - 'ORDER BY' => 'rev_timestamp DESC' ) + 'ORDER BY' => 'rev_timestamp DESC' ) ); if ( $s === false ) { # No one else ever edited this page return array( array( 'cantrollback' ) ); - } else if ( $s->rev_deleted & REVISION::DELETED_TEXT || $s->rev_deleted & REVISION::DELETED_USER ) { + } else if ( $s->rev_deleted & Revision::DELETED_TEXT || $s->rev_deleted & Revision::DELETED_USER ) { # Only admins can see this text return array( array( 'notvisiblerev' ) ); } @@ -3107,6 +3411,7 @@ class Article { # Mark all reverted edits as bot $set['rc_bot'] = 1; } + if ( $wgUseRCPatrol ) { # Mark all reverted edits as patrolled $set['rc_patrolled'] = 1; @@ -3143,11 +3448,14 @@ class Article { # Save $flags = EDIT_UPDATE; - if ( $wgUser->isAllowed( 'minoredit' ) ) + if ( $wgUser->isAllowed( 'minoredit' ) ) { $flags |= EDIT_MINOR; + } - if ( $bot && ( $wgUser->isAllowed( 'markbotedits' ) || $wgUser->isAllowed( 'bot' ) ) ) + if ( $bot && ( $wgUser->isAllowed( 'markbotedits' ) || $wgUser->isAllowed( 'bot' ) ) ) { $flags |= EDIT_FORCE_BOT; + } + # Actually store the edit $status = $this->doEdit( $target->getText(), $summary, $flags, $target->getId() ); if ( !empty( $status->value['revision'] ) ) { @@ -3164,6 +3472,7 @@ class Article { 'target' => $target, 'newid' => $revId ); + return array(); } @@ -3171,7 +3480,8 @@ class Article { * User interface for rollback operations */ public function rollback() { - global $wgUser, $wgOut, $wgRequest, $wgUseRCPatrol; + global $wgUser, $wgOut, $wgRequest; + $details = null; $result = $this->doRollback( @@ -3186,26 +3496,31 @@ class Article { $wgOut->rateLimited(); return; } + if ( isset( $result[0][0] ) && ( $result[0][0] == 'alreadyrolled' || $result[0][0] == 'cantrollback' ) ) { $wgOut->setPageTitle( wfMsg( 'rollbackfailed' ) ); $errArray = $result[0]; $errMsg = array_shift( $errArray ); $wgOut->addWikiMsgArray( $errMsg, $errArray ); + if ( isset( $details['current'] ) ) { $current = $details['current']; + if ( $current->getComment() != '' ) { $wgOut->addWikiMsgArray( 'editcomment', array( $wgUser->getSkin()->formatComment( $current->getComment() ) ), array( 'replaceafter' ) ); } } + return; } + # Display permissions errors before read-only message -- there's no # point in misleading the user into thinking the inability to rollback # is only temporary. if ( !empty( $result ) && $result !== array( array( 'readonlytext' ) ) ) { - # array_diff is completely broken for arrays of arrays, sigh. Re- - # move any 'readonlytext' error manually. + # array_diff is completely broken for arrays of arrays, sigh. + # Remove any 'readonlytext' error manually. $out = array(); foreach ( $result as $error ) { if ( $error != array( 'readonlytext' ) ) { @@ -3213,10 +3528,13 @@ class Article { } } $wgOut->showPermissionsErrorPage( $out ); + return; } + if ( $result == array( array( 'readonlytext' ) ) ) { $wgOut->readOnlyPage(); + return; } @@ -3225,12 +3543,14 @@ class Article { $newId = $details['newid']; $wgOut->setPageTitle( wfMsg( 'actioncomplete' ) ); $wgOut->setRobotPolicy( 'noindex,nofollow' ); + if ( $current->getUserText() === '' ) { $old = wfMsg( 'rev-deleted-user' ); } else { $old = $wgUser->getSkin()->userLink( $current->getUser(), $current->getUserText() ) . $wgUser->getSkin()->userToolLinks( $current->getUser(), $current->getUserText() ); } + $new = $wgUser->getSkin()->userLink( $target->getUser(), $target->getUserText() ) . $wgUser->getSkin()->userToolLinks( $target->getUser(), $target->getUserText() ); $wgOut->addHTML( wfMsgExt( 'rollback-success', array( 'parse', 'replaceafter' ), $old, $new ) ); @@ -3242,7 +3562,6 @@ class Article { } } - /** * Do standard deferred updates after page view */ @@ -3251,12 +3570,14 @@ class Article { if ( wfReadOnly() ) { return; } + # Don't update page view counters on views from bot users (bug 14044) if ( !$wgDisableCounters && !$wgUser->isAllowed( 'bot' ) && $this->getID() ) { Article::incViewCount( $this->getID() ); $u = new SiteStatsUpdate( 1, 0, 0 ); array_push( $wgDeferredUpdateList, $u ); } + # Update newtalk / watchlist notification status $wgUser->clearNotification( $this->mTitle ); } @@ -3270,15 +3591,19 @@ class Article { // Already prepared return $this->mPreparedEdit; } + global $wgParser; + $edit = (object)array(); $edit->revid = $revid; $edit->newText = $text; $edit->pst = $this->preSaveTransform( $text ); - $options = $this->getParserOptions(); - $edit->output = $wgParser->parse( $edit->pst, $this->mTitle, $options, true, true, $revid ); + $edit->popts = $this->getParserOptions(); + $edit->output = $wgParser->parse( $edit->pst, $this->mTitle, $edit->popts, true, true, $revid ); $edit->oldText = $this->getContent(); + $this->mPreparedEdit = $edit; + return $edit; } @@ -3289,12 +3614,12 @@ class Article { * Every 100th edit, prune the recent changes table. * * @private - * @param $text New text of the article - * @param $summary Edit summary - * @param $minoredit Minor edit + * @param $text String: New text of the article + * @param $summary String: Edit summary + * @param $minoredit Boolean: Minor edit * @param $timestamp_of_pagechange Timestamp associated with the page change - * @param $newid rev_id value of the new revision - * @param $changed Whether or not the content actually changed + * @param $newid Integer: rev_id value of the new revision + * @param $changed Boolean: Whether or not the content actually changed */ public function editUpdates( $text, $summary, $minoredit, $timestamp_of_pagechange, $newid, $changed = true ) { global $wgDeferredUpdateList, $wgMessageCache, $wgUser, $wgEnableParserCache; @@ -3313,9 +3638,8 @@ class Article { # Save it to the parser cache if ( $wgEnableParserCache ) { - $popts = $this->getParserOptions(); $parserCache = ParserCache::singleton(); - $parserCache->save( $editInfo->output, $this, $popts ); + $parserCache->save( $editInfo->output, $this, $editInfo->popts ); } # Update the links tables @@ -3329,10 +3653,12 @@ class Article { // Flush old entries from the `recentchanges` table; we do this on // random requests so as to avoid an increase in writes for no good reason global $wgRCMaxAge; + $dbw = wfGetDB( DB_MASTER ); $cutoff = $dbw->timestamp( time() - $wgRCMaxAge ); $recentchanges = $dbw->tableName( 'recentchanges' ); $sql = "DELETE FROM $recentchanges WHERE rc_timestamp < '{$cutoff}'"; + $dbw->query( $sql ); } } @@ -3356,7 +3682,8 @@ class Article { # load of user talk pages and piss people off, nor if it's a minor edit # by a properly-flagged bot. if ( $this->mTitle->getNamespace() == NS_USER_TALK && $shortTitle != $wgUser->getTitleKey() && $changed - && !( $minoredit && $wgUser->isAllowed( 'nominornewtalk' ) ) ) { + && !( $minoredit && $wgUser->isAllowed( 'nominornewtalk' ) ) + ) { if ( wfRunHooks( 'ArticleEditUpdateNewTalk', array( &$this ) ) ) { $other = User::newFromName( $shortTitle, false ); if ( !$other ) { @@ -3410,13 +3737,14 @@ class Article { return; } - $unhide = $wgRequest->getInt( 'unhide' ) == 1 && - $wgUser->matchEditToken( $wgRequest->getVal( 'token' ), $oldid ); + $unhide = $wgRequest->getInt( 'unhide' ) == 1; + # Cascade unhide param in links for easy deletion browsing $extraParams = array(); if ( $wgRequest->getVal( 'unhide' ) ) { $extraParams['unhide'] = 1; } + $revision = Revision::newFromId( $oldid ); $current = ( $oldid == $this->mLatest ); @@ -3496,6 +3824,7 @@ class Article { ); $cdel = ''; + // User can delete revisions or view deleted revisions... $canHide = $wgUser->isAllowed( 'deleterevision' ); if ( $canHide || ( $revision->getVisibility() && $wgUser->isAllowed( 'deletedhistory' ) ) ) { @@ -3534,6 +3863,7 @@ class Article { "</div>\n" . "\n\t\t\t\t<div id=\"mw-revision-nav\">" . $cdel . wfMsgExt( 'revision-nav', array( 'escapenoentities', 'parsemag', 'replaceafter' ), $prevdiff, $prevlink, $lnk, $curdiff, $nextlink, $nextdiff ) . "</div>\n\t\t\t"; + $wgOut->setSubtitle( $r ); } @@ -3541,10 +3871,13 @@ class Article { * This function is called right before saving the wikitext, * so we can do things like signatures and links-in-context. * - * @param $text String + * @param $text String article contents + * @return string article contents with altered wikitext markup (signatures + * converted, {{subst:}}, templates, etc.) */ public function preSaveTransform( $text ) { global $wgParser, $wgUser; + return $wgParser->preSaveTransform( $text, $this->mTitle, $wgUser, ParserOptions::newFromUser( $wgUser ) ); } @@ -3554,13 +3887,17 @@ class Article { * checkLastModified returns true if it has taken care of all * output to the client that is necessary for this request. * (that is, it has sent a cached version of the page) + * + * @return boolean true if cached version send, false otherwise */ protected function tryFileCache() { static $called = false; + if ( $called ) { wfDebug( "Article::tryFileCache(): called twice!?\n" ); return false; } + $called = true; if ( $this->isFileCacheable() ) { $cache = new HTMLFileCache( $this->mTitle ); @@ -3575,6 +3912,7 @@ class Article { } else { wfDebug( "Article::tryFileCache(): not cacheable\n" ); } + return false; } @@ -3584,45 +3922,51 @@ class Article { */ public function isFileCacheable() { $cacheable = false; + if ( HTMLFileCache::useFileCache() ) { - $cacheable = $this->getID() && !$this->mRedirectedFrom; + $cacheable = $this->getID() && !$this->mRedirectedFrom && !$this->mTitle->isRedirect(); // Extension may have reason to disable file caching on some pages. if ( $cacheable ) { $cacheable = wfRunHooks( 'IsFileCacheable', array( &$this ) ); } } + return $cacheable; } /** * Loads page_touched and returns a value indicating if it should be used - * + * @return boolean true if not a redirect */ public function checkTouched() { if ( !$this->mDataLoaded ) { $this->loadPageData(); } + return !$this->mIsRedirect; } /** * Get the page_touched field + * @return string containing GMT timestamp */ public function getTouched() { - # Ensure that page data has been loaded if ( !$this->mDataLoaded ) { $this->loadPageData(); } + return $this->mTouched; } /** * Get the page_latest field + * @return integer rev_id of current revision */ public function getLatest() { if ( !$this->mDataLoaded ) { $this->loadPageData(); } + return (int)$this->mLatest; } @@ -3648,6 +3992,7 @@ class Article { $revision->insertOn( $dbw ); $this->updateRevisionOn( $dbw, $revision ); + global $wgUser; wfRunHooks( 'NewRevisionFromEditComplete', array( $this, $revision, false, $wgUser ) ); wfProfileOut( __METHOD__ ); @@ -3660,6 +4005,7 @@ class Article { */ public static function incViewCount( $id ) { $id = intval( $id ); + global $wgHitcounterUpdateFreq; $dbw = wfGetDB( DB_MASTER ); @@ -3670,6 +4016,7 @@ class Article { if ( $wgHitcounterUpdateFreq <= 1 || $dbType == 'sqlite' ) { $dbw->query( "UPDATE $pageTable SET page_counter = page_counter + 1 WHERE page_id = $id" ); + return; } @@ -3682,12 +4029,14 @@ class Article { if ( ( rand() % $checkfreq != 0 ) or ( $dbw->lastErrno() != 0 ) ) { # Most of the time (or on SQL errors), skip row count check $dbw->ignoreErrors( $oldignore ); + return; } $res = $dbw->query( "SELECT COUNT(*) as n FROM $hitcounterTable" ); $row = $dbw->fetchObject( $res ); $rown = intval( $row->n ); + if ( $rown >= $wgHitcounterUpdateFreq ) { wfProfileIn( 'Article::incViewCount-collect' ); $old_user_abort = ignore_user_abort( true ); @@ -3699,11 +4048,11 @@ class Article { 'GROUP BY hc_id', __METHOD__ ); $dbw->delete( 'hitcounter', '*', __METHOD__ ); $dbw->unlockTables( __METHOD__ ); + if ( $dbType == 'mysql' ) { $dbw->query( "UPDATE $pageTable,$acchitsTable SET page_counter=page_counter + hc_n " . 'WHERE page_id = hc_id', __METHOD__ ); - } - else { + } else { $dbw->query( "UPDATE $pageTable SET page_counter=page_counter + hc_n " . "FROM $acchitsTable WHERE page_id = hc_id", __METHOD__ ); } @@ -3712,6 +4061,7 @@ class Article { ignore_user_abort( $old_user_abort ); wfProfileOut( 'Article::incViewCount-collect' ); } + $dbw->ignoreErrors( $oldignore ); } @@ -3733,6 +4083,7 @@ class Article { } else { $other = $title->getTalkPage(); } + $other->invalidateCache(); $other->purgeSquid(); @@ -3741,14 +4092,19 @@ class Article { $title->deleteTitleProtection(); } + /** + * Clears caches when article is deleted + */ public static function onArticleDelete( $title ) { global $wgMessageCache; + # Update existence markers on article/talk tabs... if ( $title->isTalkPage() ) { $other = $title->getSubjectPage(); } else { $other = $title->getTalkPage(); } + $other->invalidateCache(); $other->purgeSquid(); @@ -3762,24 +4118,30 @@ class Article { if ( $title->getNamespace() == NS_MEDIAWIKI ) { $wgMessageCache->replace( $title->getDBkey(), false ); } + # Images if ( $title->getNamespace() == NS_FILE ) { $update = new HTMLCacheUpdate( $title, 'imagelinks' ); $update->doUpdate(); } + # User talk pages if ( $title->getNamespace() == NS_USER_TALK ) { $user = User::newFromName( $title->getText(), false ); $user->setNewtalk( false ); } + # Image redirects RepoGroup::singleton()->getLocalRepo()->invalidateImageRedirect( $title ); } /** * Purge caches on page update etc + * + * @param $title Title object + * @todo: verify that $title is always a Title object (and never false or null), add Title hint to parameter $title */ - public static function onArticleEdit( $title, $flags = '' ) { + public static function onArticleEdit( $title ) { global $wgDeferredUpdateList; // Invalidate caches of articles which include this page @@ -3836,6 +4198,7 @@ class Article { : 'noarticletextanon'; $wgOut->addHTML( wfMsgExt( $msg, 'parse' ) ); } + $wgOut->addHTML( '</div>' ); } else { $dbr = wfGetDB( DB_SLAVE ); @@ -3852,15 +4215,21 @@ class Article { $pageInfo = $this->pageCountInfo( $page ); $talkInfo = $this->pageCountInfo( $page->getTalkPage() ); + + //FIXME: unescaped messages $wgOut->addHTML( "<ul><li>" . wfMsg( "numwatchers", $wgLang->formatNum( $numwatchers ) ) . '</li>' ); $wgOut->addHTML( "<li>" . wfMsg( 'numedits', $wgLang->formatNum( $pageInfo['edits'] ) ) . '</li>' ); + if ( $talkInfo ) { $wgOut->addHTML( '<li>' . wfMsg( "numtalkedits", $wgLang->formatNum( $talkInfo['edits'] ) ) . '</li>' ); } + $wgOut->addHTML( '<li>' . wfMsg( "numauthors", $wgLang->formatNum( $pageInfo['authors'] ) ) . '</li>' ); + if ( $talkInfo ) { $wgOut->addHTML( '<li>' . wfMsg( 'numtalkauthors', $wgLang->formatNum( $talkInfo['authors'] ) ) . '</li>' ); } + $wgOut->addHTML( '</ul>' ); } } @@ -3870,13 +4239,15 @@ class Article { * on a given page. If page does not exist, returns false. * * @param $title Title object - * @return array + * @return mixed array or boolean false */ public function pageCountInfo( $title ) { $id = $title->getArticleId(); + if ( $id == 0 ) { return false; } + $dbr = wfGetDB( DB_SLAVE ); $rev_clause = array( 'rev_page' => $id ); $edits = $dbr->selectField( @@ -3893,6 +4264,7 @@ class Article { __METHOD__, $this->getSelectOptions() ); + return array( 'edits' => $edits, 'authors' => $authors ); } @@ -3905,20 +4277,23 @@ class Article { public function getUsedTemplates() { $result = array(); $id = $this->mTitle->getArticleID(); + if ( $id == 0 ) { return array(); } + $dbr = wfGetDB( DB_SLAVE ); $res = $dbr->select( array( 'templatelinks' ), array( 'tl_namespace', 'tl_title' ), array( 'tl_from' => $id ), __METHOD__ ); + if ( $res !== false ) { foreach ( $res as $row ) { $result[] = Title::makeTitle( $row->tl_namespace, $row->tl_title ); } } - $dbr->freeResult( $res ); + return $result; } @@ -3931,21 +4306,24 @@ class Article { public function getHiddenCategories() { $result = array(); $id = $this->mTitle->getArticleID(); + if ( $id == 0 ) { return array(); } + $dbr = wfGetDB( DB_SLAVE ); $res = $dbr->select( array( 'categorylinks', 'page_props', 'page' ), array( 'cl_to' ), array( 'cl_from' => $id, 'pp_page=page_id', 'pp_propname' => 'hiddencat', 'page_namespace' => NS_CATEGORY, 'page_title=cl_to' ), __METHOD__ ); + if ( $res !== false ) { foreach ( $res as $row ) { $result[] = Title::makeTitle( NS_CATEGORY, $row->cl_to ); } } - $dbr->freeResult( $res ); + return $result; } @@ -3957,11 +4335,14 @@ class Article { * @return string An appropriate autosummary, or an empty string. */ public static function getAutosummary( $oldtext, $newtext, $flags ) { + global $wgContLang; + # Decide what kind of autosummary is needed. # Redirect autosummaries $ot = Title::newFromRedirect( $oldtext ); $rt = Title::newFromRedirect( $newtext ); + if ( is_object( $rt ) && ( !is_object( $ot ) || !$rt->equals( $ot ) || $ot->getFragment() != $rt->getFragment() ) ) { return wfMsgForContent( 'autoredircomment', $rt->getFullText() ); } @@ -3969,10 +4350,11 @@ class Article { # New page autosummaries if ( $flags & EDIT_NEW && strlen( $newtext ) ) { # If they're making a new article, give its text, truncated, in the summary. - global $wgContLang; + $truncatedtext = $wgContLang->truncate( str_replace( "\n", ' ', $newtext ), max( 0, 200 - strlen( wfMsgForContent( 'autosumm-new' ) ) ) ); + return wfMsgForContent( 'autosumm-new', $truncatedtext ); } @@ -3981,10 +4363,11 @@ class Article { return wfMsgForContent( 'autosumm-blank' ); } elseif ( strlen( $oldtext ) > 10 * strlen( $newtext ) && strlen( $newtext ) < 500 ) { # Removing more than 90% of the article - global $wgContLang; + $truncatedtext = $wgContLang->truncate( $newtext, max( 0, 200 - strlen( wfMsgForContent( 'autosumm-replace' ) ) ) ); + return wfMsgForContent( 'autosumm-replace', $truncatedtext ); } @@ -4000,6 +4383,7 @@ class Article { * * @param $text String * @param $cache Boolean + * @param $parserOptions mixed ParserOptions object, or boolean false */ public function outputWikiText( $text, $cache = true, $parserOptions = false ) { global $wgOut; @@ -4012,9 +4396,14 @@ class Article { * This does all the heavy lifting for outputWikitext, except it returns the parser * output instead of sending it straight to $wgOut. Makes things nice and simple for, * say, embedding thread pages within a discussion system (LiquidThreads) + * + * @param $text string + * @param $cache boolean + * @param $parserOptions parsing options, defaults to false + * @return string containing parsed output */ public function getOutputFromWikitext( $text, $cache = true, $parserOptions = false ) { - global $wgParser, $wgOut, $wgEnableParserCache, $wgUseFileCache; + global $wgParser, $wgEnableParserCache, $wgUseFileCache; if ( !$parserOptions ) { $parserOptions = $this->getParserOptions(); @@ -4031,33 +4420,46 @@ class Article { $this->mTitle->getPrefixedDBkey() ) ); } - if ( $wgEnableParserCache && $cache && $this && $this->mParserOutput->getCacheTime() != -1 ) { + if ( $wgEnableParserCache && $cache && $this->mParserOutput->isCacheable() ) { $parserCache = ParserCache::singleton(); $parserCache->save( $this->mParserOutput, $this, $parserOptions ); } + // Make sure file cache is not used on uncacheable content. // Output that has magic words in it can still use the parser cache // (if enabled), though it will generally expire sooner. - if ( $this->mParserOutput->getCacheTime() == -1 || $this->mParserOutput->containsOldMagic() ) { + if ( !$this->mParserOutput->isCacheable() || $this->mParserOutput->containsOldMagic() ) { $wgUseFileCache = false; } + $this->doCascadeProtectionUpdates( $this->mParserOutput ); + return $this->mParserOutput; } /** * Get parser options suitable for rendering the primary article wikitext + * @return mixed ParserOptions object or boolean false */ public function getParserOptions() { global $wgUser; + if ( !$this->mParserOptions ) { $this->mParserOptions = new ParserOptions( $wgUser ); $this->mParserOptions->setTidy( true ); $this->mParserOptions->enableLimitReport(); } - return $this->mParserOptions; + + // Clone to allow modifications of the return value without affecting + // the cache + return clone $this->mParserOptions; } + /** + * Updates cascading protections + * + * @param $parserOutput mixed ParserOptions object, or boolean false + **/ protected function doCascadeProtectionUpdates( $parserOutput ) { if ( !$this->isCurrent() || wfReadOnly() || !$this->mTitle->areRestrictionsCascading() ) { return; @@ -4079,9 +4481,9 @@ class Article { $res = $dbr->select( array( 'templatelinks' ), array( 'tl_namespace', 'tl_title' ), array( 'tl_from' => $id ), - __METHOD__ ); + __METHOD__ + ); - global $wgContLang; foreach ( $res as $row ) { $tlTemplates["{$row->tl_namespace}:{$row->tl_title}"] = true; } @@ -4095,7 +4497,6 @@ class Article { } # Get the diff - # Note that we simulate array_diff_key in PHP <5.0.x $templates_diff = array_diff_key( $poTemplates, $tlTemplates ); if ( count( $templates_diff ) > 0 ) { @@ -4111,7 +4512,6 @@ class Article { * * @param $added array The names of categories that were added * @param $deleted array The names of categories that were deleted - * @return null */ public function updateCategoryCounts( $added, $deleted ) { $ns = $this->mTitle->getNamespace(); @@ -4128,7 +4528,9 @@ class Article { # Okay, nothing to do return; } + $insertRows = array(); + foreach ( $insertCats as $cat ) { $insertRows[] = array( 'cat_id' => $dbw->nextSequenceValue( 'category_cat_id_seq' ), @@ -4139,6 +4541,7 @@ class Article { $addFields = array( 'cat_pages = cat_pages + 1' ); $removeFields = array( 'cat_pages = cat_pages - 1' ); + if ( $ns == NS_CATEGORY ) { $addFields[] = 'cat_subcats = cat_subcats + 1'; $removeFields[] = 'cat_subcats = cat_subcats - 1'; @@ -4155,6 +4558,7 @@ class Article { __METHOD__ ); } + if ( $deleted ) { $dbw->update( 'category', @@ -4165,21 +4569,27 @@ class Article { } } - /** Lightweight method to get the parser output for a page, checking the parser cache + /** + * Lightweight method to get the parser output for a page, checking the parser cache * and so on. Doesn't consider most of the stuff that Article::view is forced to * consider, so it's not appropriate to use there. + * + * @since 1.16 (r52326) for LiquidThreads + * + * @param $oldid mixed integer Revision ID or null */ - function getParserOutput( $oldid = null ) { - global $wgEnableParserCache, $wgUser, $wgOut; + public function getParserOutput( $oldid = null ) { + global $wgEnableParserCache, $wgUser; // Should the parser cache be used? $useParserCache = $wgEnableParserCache && - intval( $wgUser->getOption( 'stubthreshold' ) ) == 0 && - $this->exists() && - $oldid === null; + $wgUser->getStubThreshold() == 0 && + $this->exists() && + $oldid === null; wfDebug( __METHOD__ . ': using parser cache: ' . ( $useParserCache ? 'yes' : 'no' ) . "\n" ); - if ( $wgUser->getOption( 'stubthreshold' ) ) { + + if ( $wgUser->getStubThreshold() ) { wfIncrStats( 'pcache_miss_stub' ); } @@ -4197,4 +4607,66 @@ class Article { return $parserOutput; } } + + // Deprecated methods + /** + * Get the database which should be used for reads + * + * @return Database + * @deprecated - just call wfGetDB( DB_MASTER ) instead + */ + function getDB() { + wfDeprecated( __METHOD__ ); + return wfGetDB( DB_MASTER ); + } + +} + +class PoolWorkArticleView extends PoolCounterWork { + private $mArticle; + + function __construct( $article, $key, $useParserCache, $parserOptions ) { + parent::__construct( 'ArticleView', $key ); + $this->mArticle = $article; + $this->cacheable = $useParserCache; + $this->parserOptions = $parserOptions; + } + + function doWork() { + return $this->mArticle->doViewParse(); + } + + function getCachedWork() { + global $wgOut; + + $parserCache = ParserCache::singleton(); + $this->mArticle->mParserOutput = $parserCache->get( $this->mArticle, $this->parserOptions ); + + if ( $this->mArticle->mParserOutput !== false ) { + wfDebug( __METHOD__ . ": showing contents parsed by someone else\n" ); + $wgOut->addParserOutput( $this->mArticle->mParserOutput ); + # Ensure that UI elements requiring revision ID have + # the correct version information. + $wgOut->setRevisionId( $this->mArticle->getLatest() ); + return true; + } + return false; + } + + function fallback() { + return $this->mArticle->tryDirtyCache(); + } + + function error( $status ) { + global $wgOut; + + $wgOut->clearHTML(); // for release() errors + $wgOut->enableClientCache( false ); + $wgOut->setRobotPolicy( 'noindex,nofollow' ); + + $errortext = $status->getWikiText( false, 'view-pool-error' ); + $wgOut->addWikiText( '<div class="errorbox">' . $errortext . '</div>' ); + + return false; + } } |