.*?<\/h[1-6].*?>(?!\S)/mi',$subheadline,$matches);
$subhlevel=$matches[1];
if(strpos($subhlevel,'=')!==false) {
$subhlevel=strlen($subhlevel);
@@ -226,28 +300,24 @@ class Article {
}
/**
- * Return an array of the columns of the "cur"-table
+ * @return int The oldid of the article that is to be shown, 0 for the
+ * current revision
*/
- function getContentFields() {
- return $wgArticleContentFields = array(
- 'old_text','old_flags',
- 'rev_timestamp','rev_user', 'rev_user_text', 'rev_comment','page_counter',
- 'page_namespace', 'page_title', 'page_restrictions','page_touched','page_is_redirect' );
+ function getOldID() {
+ if ( is_null( $this->mOldId ) ) {
+ $this->mOldId = $this->getOldIDFromRequest();
+ }
+ return $this->mOldId;
}
/**
- * Return the oldid of the article that is to be shown.
- * For requests with a "direction", this is not the oldid of the
- * query
+ * Sets $this->mRedirectUrl to a correct URL if the query parameters are incorrect
+ *
+ * @return int The old id for the request
*/
- function getOldID() {
- global $wgRequest, $wgOut;
- static $lastid;
-
- if ( isset( $lastid ) ) {
- return $lastid;
- }
- # Query variables :P
+ function getOldIDFromRequest() {
+ global $wgRequest;
+ $this->mRedirectUrl = false;
$oldid = $wgRequest->getVal( 'oldid' );
if ( isset( $oldid ) ) {
$oldid = intval( $oldid );
@@ -256,7 +326,7 @@ class Article {
if ( $nextid ) {
$oldid = $nextid;
} else {
- $wgOut->redirect( $this->mTitle->getFullURL( 'redirect=no' ) );
+ $this->mRedirectUrl = $this->mTitle->getFullURL( 'redirect=no' );
}
} elseif ( $wgRequest->getVal( 'direction' ) == 'prev' ) {
$previd = $this->mTitle->getPreviousRevisionID( $oldid );
@@ -268,21 +338,20 @@ class Article {
}
$lastid = $oldid;
}
- return @$oldid; # "@" to be able to return "unset" without PHP complaining
+ if ( !$oldid ) {
+ $oldid = 0;
+ }
+ return $oldid;
}
-
/**
- * Load the revision (including cur_text) into this object
+ * Load the revision (including text) into this object
*/
- function loadContent( $noredir = false ) {
- global $wgOut, $wgRequest;
-
+ function loadContent() {
if ( $this->mContentLoaded ) return;
# Query variables :P
$oldid = $this->getOldID();
- $redirect = $wgRequest->getVal( 'redirect' );
$fname = 'Article::loadContent';
@@ -291,10 +360,8 @@ class Article {
$t = $this->mTitle->getPrefixedText();
- $noredir = $noredir || ($wgRequest->getVal( 'redirect' ) == 'no')
- || $wgRequest->getCheck( 'rdfrom' );
$this->mOldId = $oldid;
- $this->fetchContent( $oldid, $noredir, true );
+ $this->fetchContent( $oldid );
}
@@ -305,8 +372,7 @@ class Article {
* @access private
*/
function pageData( &$dbr, $conditions ) {
- return $dbr->selectRow( 'page',
- array(
+ $fields = array(
'page_id',
'page_namespace',
'page_title',
@@ -317,20 +383,32 @@ class Article {
'page_random',
'page_touched',
'page_latest',
- 'page_len' ),
+ 'page_len' ) ;
+ wfRunHooks( 'ArticlePageDataBefore', array( &$this , &$fields ) ) ;
+ $row = $dbr->selectRow( 'page',
+ $fields,
$conditions,
'Article::pageData' );
+ wfRunHooks( 'ArticlePageDataAfter', array( &$this , &$row ) ) ;
+ return $row ;
}
+ /**
+ * @param Database $dbr
+ * @param Title $title
+ */
function pageDataFromTitle( &$dbr, $title ) {
return $this->pageData( $dbr, array(
'page_namespace' => $title->getNamespace(),
'page_title' => $title->getDBkey() ) );
}
+ /**
+ * @param Database $dbr
+ * @param int $id
+ */
function pageDataFromId( &$dbr, $id ) {
- return $this->pageData( $dbr, array(
- 'page_id' => intval( $id ) ) );
+ return $this->pageData( $dbr, array( 'page_id' => $id ) );
}
/**
@@ -340,29 +418,43 @@ class Article {
* @param object $data
* @access private
*/
- function loadPageData( $data ) {
- $this->mTitle->loadRestrictions( $data->page_restrictions );
- $this->mTitle->mRestrictionsLoaded = true;
-
- $this->mCounter = $data->page_counter;
- $this->mTouched = wfTimestamp( TS_MW, $data->page_touched );
- $this->mIsRedirect = $data->page_is_redirect;
- $this->mLatest = $data->page_latest;
+ function loadPageData( $data = 'fromdb' ) {
+ if ( $data === 'fromdb' ) {
+ $dbr =& $this->getDB();
+ $data = $this->pageDataFromId( $dbr, $this->getId() );
+ }
+
+ $lc =& LinkCache::singleton();
+ if ( $data ) {
+ $lc->addGoodLinkObj( $data->page_id, $this->mTitle );
+
+ $this->mTitle->mArticleID = $data->page_id;
+ $this->mTitle->loadRestrictions( $data->page_restrictions );
+ $this->mTitle->mRestrictionsLoaded = true;
+
+ $this->mCounter = $data->page_counter;
+ $this->mTouched = wfTimestamp( TS_MW, $data->page_touched );
+ $this->mIsRedirect = $data->page_is_redirect;
+ $this->mLatest = $data->page_latest;
+ } else {
+ $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 int $oldid 0 for whatever the latest revision is
- * @param bool $noredir Set to false to follow redirects
- * @param bool $globalTitle Set to true to change the global $wgTitle object when following redirects or other unexpected title changes
* @return string
*/
- function fetchContent( $oldid = 0, $noredir = true, $globalTitle = false ) {
+ function fetchContent( $oldid = 0 ) {
if ( $this->mContentLoaded ) {
return $this->mContent;
}
+
$dbr =& $this->getDB();
$fname = 'Article::fetchContent';
@@ -372,11 +464,7 @@ class Article {
if( $oldid ) {
$t .= ',oldid='.$oldid;
}
- if( isset( $redirect ) ) {
- $redirect = ($redirect == 'no') ? 'no' : 'yes';
- $t .= ',redirect='.$redirect;
- }
- $this->mContent = wfMsg( 'missingarticle', $t );
+ $this->mContent = wfMsg( 'missingarticle', $t ) ;
if( $oldid ) {
$revision = Revision::newFromId( $oldid );
@@ -407,51 +495,6 @@ class Article {
}
}
- # If we got a redirect, follow it (unless we've been told
- # not to by either the function parameter or the query
- if ( !$oldid && !$noredir ) {
- $rt = Title::newFromRedirect( $revision->getText() );
- # process if title object is valid and not special:userlogout
- if ( $rt && ! ( $rt->getNamespace() == NS_SPECIAL && $rt->getText() == 'Userlogout' ) ) {
- # Gotta hand redirects to special pages differently:
- # Fill the HTTP response "Location" header and ignore
- # the rest of the page we're on.
- global $wgDisableHardRedirects;
- if( $globalTitle && !$wgDisableHardRedirects ) {
- global $wgOut;
- if ( $rt->getInterwiki() != '' && $rt->isLocal() ) {
- $source = $this->mTitle->getFullURL( 'redirect=no' );
- $wgOut->redirect( $rt->getFullURL( 'rdfrom=' . urlencode( $source ) ) ) ;
- return false;
- }
- if ( $rt->getNamespace() == NS_SPECIAL ) {
- $wgOut->redirect( $rt->getFullURL() );
- return false;
- }
- }
- $redirData = $this->pageDataFromTitle( $dbr, $rt );
- if( $redirData ) {
- $redirRev = Revision::newFromId( $redirData->page_latest );
- if( !is_null( $redirRev ) ) {
- $this->mRedirectedFrom = $this->mTitle->getPrefixedText();
- $this->mTitle = $rt;
- $data = $redirData;
- $this->loadPageData( $data );
- $revision = $redirRev;
- }
- }
- }
- }
-
- # if the title's different from expected, update...
- if( $globalTitle ) {
- global $wgTitle;
- if( !$this->mTitle->equals( $wgTitle ) ) {
- $wgTitle = $this->mTitle;
- }
- }
-
- # Back to the business at hand...
$this->mContent = $revision->getText();
$this->mUser = $revision->getUser();
@@ -463,21 +506,15 @@ class Article {
$this->mContentLoaded = true;
$this->mRevision =& $revision;
- return $this->mContent;
- }
+ wfRunHooks( 'ArticleAfterFetchContent', array( &$this, &$this->mContent ) ) ;
- /**
- * Gets the article text without using so many damn globals
- * Returns false on error
- *
- * @param integer $oldid
- */
- function getContentWithoutUsingSoManyDamnGlobals( $oldid = 0, $noredir = false ) {
- return $this->fetchContent( $oldid, $noredir, false );
+ return $this->mContent;
}
/**
* Read/write accessor to select FOR UPDATE
+ *
+ * @param mixed $x
*/
function forUpdate( $x = NULL ) {
return wfSetVar( $this->mForUpdate, $x );
@@ -485,21 +522,20 @@ class Article {
/**
* Get the database which should be used for reads
+ *
+ * @return Database
*/
function &getDB() {
$ret =& wfGetDB( DB_MASTER );
return $ret;
- #if ( $this->mForUpdate ) {
- $ret =& wfGetDB( DB_MASTER );
- #} else {
- # $ret =& wfGetDB( DB_SLAVE );
- #}
- return $ret;
}
/**
* Get options for all SELECT statements
- * Can pass an option array, to which the class-wide options will be appended
+ *
+ * @param array $options an optional options array which'll be appended to
+ * the default
+ * @return array Options
*/
function getSelectOptions( $options = '' ) {
if ( $this->mForUpdate ) {
@@ -513,7 +549,7 @@ class Article {
}
/**
- * Return the Article ID
+ * @return int Page ID
*/
function getID() {
if( $this->mTitle ) {
@@ -524,44 +560,51 @@ class Article {
}
/**
- * Returns true if this article exists in the database.
- * @return bool
+ * @return bool Whether or not the page exists in the database
*/
function exists() {
return $this->getId() != 0;
}
/**
- * Get the view count for this article
+ * @return int The view count for the page
*/
function getCount() {
if ( -1 == $this->mCounter ) {
$id = $this->getID();
- $dbr =& $this->getDB();
- $this->mCounter = $dbr->selectField( 'page', 'page_counter', array( 'page_id' => $id ),
- 'Article::getCount', $this->getSelectOptions() );
+ if ( $id == 0 ) {
+ $this->mCounter = 0;
+ } else {
+ $dbr =& wfGetDB( DB_SLAVE );
+ $this->mCounter = $dbr->selectField( 'page', 'page_counter', array( 'page_id' => $id ),
+ 'Article::getCount', $this->getSelectOptions() );
+ }
}
return $this->mCounter;
}
/**
- * Would the given text make this article a "good" article (i.e.,
- * suitable for including in the article count)?
+ * 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 string $text Text to analyze
- * @return integer 1 if it can be counted else 0
+ * @return bool
*/
function isCountable( $text ) {
global $wgUseCommaCount;
- if ( NS_MAIN != $this->mTitle->getNamespace() ) { return 0; }
- if ( $this->isRedirect( $text ) ) { return 0; }
- $token = ($wgUseCommaCount ? ',' : '[[' );
- if ( false === strstr( $text, $token ) ) { return 0; }
- return 1;
+ $token = $wgUseCommaCount ? ',' : '[[';
+ return
+ $this->mTitle->getNamespace() == NS_MAIN
+ && ! $this->isRedirect( $text )
+ && in_string( $token, $text );
}
/**
* Tests if the article text represents a redirect
+ *
+ * @param string $text
+ * @return bool
*/
function isRedirect( $text = false ) {
if ( $text === false ) {
@@ -587,11 +630,9 @@ class Article {
/**
* Loads everything except the text
* This isn't necessary for all uses, so it's only done if needed.
- * @private
+ * @access private
*/
function loadLastEdit() {
- global $wgOut;
-
if ( -1 != $this->mUser )
return;
@@ -606,11 +647,15 @@ class Article {
$this->mTimestamp = $this->mLastRevision->getTimestamp();
$this->mComment = $this->mLastRevision->getComment();
$this->mMinorEdit = $this->mLastRevision->isMinor();
+ $this->mRevIdFetched = $this->mLastRevision->getID();
}
}
function getTimestamp() {
- $this->loadLastEdit();
+ // Check if the field has been filled by ParserCache::get()
+ if ( !$this->mTimestamp ) {
+ $this->loadLastEdit();
+ }
return wfTimestamp(TS_MW, $this->mTimestamp);
}
@@ -646,7 +691,7 @@ class Article {
$title = $this->mTitle;
$contribs = array();
- $dbr =& $this->getDB();
+ $dbr =& wfGetDB( DB_SLAVE );
$revTable = $dbr->tableName( 'revision' );
$userTable = $dbr->tableName( 'user' );
$encDBkey = $dbr->addQuotes( $title->getDBkey() );
@@ -679,15 +724,24 @@ class Article {
* the given title.
*/
function view() {
- global $wgUser, $wgOut, $wgRequest, $wgOnlySysopsCanPatrol, $wgLang;
- global $wgLinkCache, $IP, $wgEnableParserCache, $wgStylePath, $wgUseRCPatrol;
- global $wgEnotif, $wgParser, $wgParserCache, $wgUseTrackbacks;
+ global $wgUser, $wgOut, $wgRequest, $wgOnlySysopsCanPatrol, $wgContLang;
+ global $wgEnableParserCache, $wgStylePath, $wgUseRCPatrol, $wgParser;
+ global $wgUseTrackbacks;
$sk = $wgUser->getSkin();
$fname = 'Article::view';
wfProfileIn( $fname );
+ $parserCache =& ParserCache::singleton();
# Get variables from query string
$oldid = $this->getOldID();
+
+ # getOldID may want us to redirect somewhere else
+ if ( $this->mRedirectUrl ) {
+ $wgOut->redirect( $this->mRedirectUrl );
+ wfProfileOut( $fname );
+ return;
+ }
+
$diff = $wgRequest->getVal( 'diff' );
$rcid = $wgRequest->getVal( 'rcid' );
$rdfrom = $wgRequest->getVal( 'rdfrom' );
@@ -701,7 +755,7 @@ class Article {
require_once( 'DifferenceEngine.php' );
$wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
- $de = new DifferenceEngine( $oldid, $diff, $rcid );
+ $de = new DifferenceEngine( $this->mTitle, $oldid, $diff, $rcid );
// DifferenceEngine directly fetched the revision:
$this->mRevIdFetched = $de->mNewid;
$de->showDiffPage();
@@ -715,7 +769,7 @@ class Article {
}
if ( empty( $oldid ) && $this->checkTouched() ) {
- $wgOut->setETag($wgParserCache->getETag($this, $wgUser));
+ $wgOut->setETag($parserCache->getETag($this, $wgUser));
if( $wgOut->checkLastModified( $this->mTouched ) ){
wfProfileOut( $fname );
@@ -734,7 +788,34 @@ class Article {
$this->exists() &&
empty( $oldid );
wfDebug( 'Article::view using parser cache: ' . ($pcache ? 'yes' : 'no' ) . "\n" );
+ if ( $wgUser->getOption( 'stubthreshold' ) ) {
+ wfIncrStats( 'pcache_miss_stub' );
+ }
+ $wasRedirected = false;
+ if ( isset( $this->mRedirectedFrom ) ) {
+ // This is an internally redirected page view.
+ // We'll need a backlink to the source page for navigation.
+ if ( wfRunHooks( 'ArticleViewRedirect', array( &$this ) ) ) {
+ $sk = $wgUser->getSkin();
+ $redir = $sk->makeKnownLinkObj( $this->mRedirectedFrom, '', 'redirect=no' );
+ $s = wfMsg( 'redirectedfrom', $redir );
+ $wgOut->setSubtitle( $s );
+ $wasRedirected = true;
+ }
+ } elseif ( !empty( $rdfrom ) ) {
+ // This is an externally redirected view, from some other wiki.
+ // If it was reported from a trusted site, supply a backlink.
+ global $wgRedirectSources;
+ if( $wgRedirectSources && preg_match( $wgRedirectSources, $rdfrom ) ) {
+ $sk = $wgUser->getSkin();
+ $redir = $sk->makeExternalLink( $rdfrom, $rdfrom );
+ $s = wfMsg( 'redirectedfrom', $redir );
+ $wgOut->setSubtitle( $s );
+ $wasRedirected = true;
+ }
+ }
+
$outputDone = false;
if ( $pcache ) {
if ( $wgOut->tryParserCache( $this, $wgUser ) ) {
@@ -742,9 +823,19 @@ class Article {
}
}
if ( !$outputDone ) {
- $text = $this->getContent( false ); # May change mTitle by following a redirect
+ $text = $this->getContent();
+ if ( $text === false ) {
+ # Failed to load, replace text with error message
+ $t = $this->mTitle->getPrefixedText();
+ if( $oldid ) {
+ $t .= ',oldid='.$oldid;
+ $text = wfMsg( 'missingarticle', $t );
+ } else {
+ $text = wfMsg( 'noarticletext', $t );
+ }
+ }
- # Another whitelist check in case oldid or redirects are altering the title
+ # Another whitelist check in case oldid is altering the title
if ( !$this->mTitle->userCanRead() ) {
$wgOut->loginToUse();
$wgOut->output();
@@ -757,25 +848,14 @@ class Article {
$this->setOldSubtitle( isset($this->mOldId) ? $this->mOldId : $oldid );
$wgOut->setRobotpolicy( 'noindex,follow' );
}
- if ( '' != $this->mRedirectedFrom ) {
- $sk = $wgUser->getSkin();
- $redir = $sk->makeKnownLink( $this->mRedirectedFrom, '',
- 'redirect=no' );
- $s = wfMsg( 'redirectedfrom', $redir );
- $wgOut->setSubtitle( $s );
-
- # Can't cache redirects
- $pcache = false;
- } elseif ( !empty( $rdfrom ) ) {
- global $wgRedirectSources;
- if( $wgRedirectSources && preg_match( $wgRedirectSources, $rdfrom ) ) {
- $sk = $wgUser->getSkin();
- $redir = $sk->makeExternalLink( $rdfrom, $rdfrom );
- $s = wfMsg( 'redirectedfrom', $redir );
- $wgOut->setSubtitle( $s );
- }
- }
-
+ }
+ if( !$outputDone ) {
+ /**
+ * @fixme: this hook doesn't work most of the time, as it doesn't
+ * trigger when the parser cache is used.
+ */
+ wfRunHooks( 'ArticleViewHeader', array( &$this ) ) ;
+ $wgOut->setRevisionId( $this->getRevIdFetched() );
# wrap user css and user js in pre and don't parse
# XXX: use $this->mTitle->usCssJsSubpage() when php is fixed/ a workaround is found
if (
@@ -786,18 +866,20 @@ class Article {
$wgOut->addHTML( ''.htmlspecialchars($this->mContent)."\n
" );
} else if ( $rt = Title::newFromRedirect( $text ) ) {
# Display redirect
- $imageUrl = $wgStylePath.'/common/images/redirect.png';
+ $imageDir = $wgContLang->isRTL() ? 'rtl' : 'ltr';
+ $imageUrl = $wgStylePath.'/common/images/redirect' . $imageDir . '.png';
+ if( !$wasRedirected ) {
+ $wgOut->setSubtitle( wfMsgHtml( 'redirectpagesub' ) );
+ }
$targetUrl = $rt->escapeLocalURL();
$titleText = htmlspecialchars( $rt->getPrefixedText() );
$link = $sk->makeLinkObj( $rt );
- $wgOut->addHTML( '
' .
+ $wgOut->addHTML( '' .
''.$link.'' );
$parseout = $wgParser->parse($text, $this->mTitle, ParserOptions::newFromUser($wgUser));
- $catlinks = $parseout->getCategoryLinks();
- $wgOut->addCategoryLinks($catlinks);
- $skin = $wgUser->getSkin();
+ $wgOut->addParserOutputNoText( $parseout );
} else if ( $pcache ) {
# Display content and save to parser cache
$wgOut->addPrimaryWikiText( $text, $this );
@@ -808,7 +890,8 @@ class Article {
if( !$this->isCurrent() ) {
$oldEditSectionSetting = $wgOut->mParserOptions->setEditSection( false );
}
- $wgOut->addWikiText( $text );
+ # Display content and don't save to parser cache
+ $wgOut->addPrimaryWikiText( $text, $this, false );
if( !$this->isCurrent() ) {
$wgOut->mParserOptions->setEditSection( $oldEditSectionSetting );
@@ -842,12 +925,6 @@ class Article {
if ($wgUseTrackbacks)
$this->addTrackbacks();
- # Put link titles into the link cache
- $wgOut->transformBuffer();
-
- # Add link titles as META keywords
- $wgOut->addMetaTags() ;
-
$this->viewUpdates();
wfProfileOut( $fname );
}
@@ -914,6 +991,51 @@ class Article {
$this->view();
}
+ /**
+ * Handle action=purge
+ */
+ function purge() {
+ global $wgUser, $wgRequest, $wgOut;
+
+ if ( $wgUser->isLoggedIn() || $wgRequest->wasPosted() ) {
+ if( wfRunHooks( 'ArticlePurge', array( &$this ) ) ) {
+ $this->doPurge();
+ }
+ } else {
+ $msg = $wgOut->parse( wfMsg( 'confirm_purge' ) );
+ $action = $this->mTitle->escapeLocalURL( 'action=purge' );
+ $button = htmlspecialchars( wfMsg( 'confirm_purge_button' ) );
+ $msg = str_replace( '$1',
+ "\n", $msg );
+
+ $wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
+ $wgOut->setRobotpolicy( 'noindex,nofollow' );
+ $wgOut->addHTML( $msg );
+ }
+ }
+
+ /**
+ * Perform the actions of a page purging
+ */
+ function doPurge() {
+ global $wgUseSquid;
+ // Invalidate the cache
+ $this->mTitle->invalidateCache();
+
+ if ( $wgUseSquid ) {
+ // Commit the transaction before the purge is sent
+ $dbw = wfGetDB( DB_MASTER );
+ $dbw->immediateCommit();
+
+ // Send purge
+ $update = SquidUpdate::newSimplePurge( $this->mTitle );
+ $update->doUpdate();
+ }
+ $this->view();
+ }
+
/**
* Insert a new empty page record for this article.
* This *must* be followed up by creating a revision
@@ -942,6 +1064,7 @@ class Article {
'page_random' => wfRandom(),
'page_touched' => $dbw->timestamp(),
'page_latest' => 0, # Fill this in shortly...
+ 'page_len' => 0, # Fill this in shortly...
), $fname );
$newid = $dbw->insertId();
@@ -955,12 +1078,12 @@ class Article {
* Update the page record to point to a newly saved revision.
*
* @param Database $dbw
- * @param Revision $revision -- for ID number, and text used to set
- length and redirect status fields
- * @param int $lastRevision -- if given, will not overwrite the page field
- * when different from the currently set value.
- * Giving 0 indicates the new page flag should
- * be set on.
+ * @param Revision $revision For ID number, and text used to set
+ length and redirect status fields
+ * @param int $lastRevision If given, will not overwrite the page field
+ * when different from the currently set value.
+ * Giving 0 indicates the new page flag should
+ * be set on.
* @return bool true on success, false on failure
* @access private
*/
@@ -1025,15 +1148,11 @@ class Article {
}
/**
- * Theoretically we could defer these whole insert and update
- * functions for after display, but that's taking a big leap
- * of faith, and we want to be able to report database
- * errors at some point.
- * @private
+ * Insert a new article into the database
+ * @access private
*/
function insertNewArticle( $text, $summary, $isminor, $watchthis, $suppressRC=false, $comment=false ) {
- global $wgOut, $wgUser;
- global $wgUseSquid, $wgDeferredUpdateList, $wgInternalServer;
+ global $wgUser;
$fname = 'Article::insertNewArticle';
wfProfileIn( $fname );
@@ -1044,8 +1163,8 @@ class Article {
wfProfileOut( $fname );
return false;
}
-
- $this->mGoodAdjustment = $this->isCountable( $text );
+
+ $this->mGoodAdjustment = (int)$this->isCountable( $text );
$this->mTotalAdjustment = 1;
$ns = $this->mTitle->getNamespace();
@@ -1056,7 +1175,9 @@ class Article {
$text="== {$summary} ==\n\n".$text;
}
$text = $this->preSaveTransform( $text );
- $isminor = ( $isminor && $wgUser->isLoggedIn() ) ? 1 : 0;
+
+ /* Silently ignore minoredit if not allowed */
+ $isminor = $isminor && $wgUser->isAllowed('minoredit');
$now = wfTimestampNow();
$dbw =& wfGetDB( DB_MASTER );
@@ -1080,15 +1201,16 @@ class Article {
Article::onArticleCreate( $this->mTitle );
if(!$suppressRC) {
+ require_once( 'RecentChange.php' );
RecentChange::notifyNew( $now, $this->mTitle, $isminor, $wgUser, $summary, 'default',
'', strlen( $text ), $revisionId );
}
if ($watchthis) {
- if(!$this->mTitle->userIsWatching()) $this->watch();
+ if(!$this->mTitle->userIsWatching()) $this->doWatch();
} else {
if ( $this->mTitle->userIsWatching() ) {
- $this->unwatch();
+ $this->doUnwatch();
}
}
@@ -1101,11 +1223,14 @@ class Article {
$fname );
# standard deferred updates
- $this->editUpdates( $text, $summary, $isminor, $now );
+ $this->editUpdates( $text, $summary, $isminor, $now, $revisionId );
$oldid = 0; # new article
$this->showArticle( $text, wfMsg( 'newarticle' ), false, $isminor, $now, $summary, $oldid );
+ wfRunHooks( 'ArticleInsertComplete', array( &$this, &$wgUser, $text,
+ $summary, $isminor,
+ $watchthis, NULL ) );
wfRunHooks( 'ArticleSaveComplete', array( &$this, &$wgUser, $text,
$summary, $isminor,
$watchthis, NULL ) );
@@ -1116,6 +1241,9 @@ class Article {
$this->replaceSection( $section, $text, $summary, $edittime );
}
+ /**
+ * @return string Complete article text, or null if error
+ */
function replaceSection($section, $text, $summary = '', $edittime = NULL) {
$fname = 'Article::replaceSection';
wfProfileIn( $fname );
@@ -1127,6 +1255,11 @@ class Article {
$dbw =& wfGetDB( DB_MASTER );
$rev = Revision::loadFromTimestamp( $dbw, $this->mTitle, $edittime );
}
+ if( is_null( $rev ) ) {
+ wfDebug( "Article::replaceSection asked for bogus section (page: " .
+ $this->getId() . "; section: $section; edittime: $edittime)\n" );
+ return null;
+ }
$oldtext = $rev->getText();
if($section=='new') {
@@ -1146,7 +1279,7 @@ class Article {
# split it up
# Unfortunately we can't simply do a preg_replace because that might
# replace the wrong section, so we have to use the section counter instead
- $secs=preg_split('/(^=+.+?=+|^.*?<\/h[1-6].*?' . '>)(?!\S)/mi',
+ $secs=preg_split('/(^=+.+?=+|^.*?<\/h[1-6].*?>)(?!\S)/mi',
$oldtext,-1,PREG_SPLIT_DELIM_CAPTURE);
$secs[$section*2]=$text."\n\n"; // replace with edited
@@ -1158,7 +1291,7 @@ class Article {
# be erased, as the mother section has been replaced with
# the text of all subsections.
$headline=$secs[$section*2-1];
- preg_match( '/^(=+).+?=+|^.*?<\/h[1-6].*?' . '>(?!\S)/mi',$headline,$matches);
+ preg_match( '/^(=+).+?=+|^.*?<\/h[1-6].*?>(?!\S)/mi',$headline,$matches);
$hlevel=$matches[1];
# determine headline level for wikimarkup headings
@@ -1173,7 +1306,7 @@ class Article {
$subheadline=$secs[$count*2-1];
preg_match(
- '/^(=+).+?=+|^.*?<\/h[1-6].*?' . '>(?!\S)/mi',$subheadline,$matches);
+ '/^(=+).+?=+|^.*?<\/h[1-6].*?>(?!\S)/mi',$subheadline,$matches);
$subhlevel=$matches[1];
if(strpos($subhlevel,'=')!==false) {
$subhlevel=strlen($subhlevel);
@@ -1210,9 +1343,8 @@ class Article {
* first set $wgUser, and clean up $wgDeferredUpdates after each edit.
*/
function updateArticle( $text, $summary, $minor, $watchthis, $forceBot = false, $sectionanchor = '' ) {
- global $wgOut, $wgUser;
- global $wgDBtransactions, $wgMwRedir;
- global $wgUseSquid, $wgInternalServer, $wgPostCommitUpdateList, $wgUseFileCache;
+ global $wgUser, $wgDBtransactions, $wgUseSquid;
+ global $wgPostCommitUpdateList, $wgUseFileCache;
$fname = 'Article::updateArticle';
wfProfileIn( $fname );
@@ -1226,18 +1358,8 @@ class Article {
return false;
}
- $isminor = ( $minor && $wgUser->isLoggedIn() );
- if ( $this->isRedirect( $text ) ) {
- # Remove all content but redirect
- # This could be done by reconstructing the redirect from a title given by
- # Title::newFromRedirect(), but then we wouldn't know which synonym the user
- # wants to see
- if ( preg_match( "/^((" . $wgMwRedir->getBaseRegex() . ')[^\\n]+)/i', $text, $m ) ) {
- $redir = 1;
- $text = $m[1] . "\n";
- }
- }
- else { $redir = 0; }
+ $isminor = $minor && $wgUser->isAllowed('minoredit');
+ $redir = (int)$this->isRedirect( $text );
$text = $this->preSaveTransform( $text );
$dbw =& wfGetDB( DB_MASTER );
@@ -1252,14 +1374,15 @@ class Article {
$userAbort = ignore_user_abort( true );
}
- $oldtext = $this->getContent( true );
+ $oldtext = $this->getContent();
$oldsize = strlen( $oldtext );
$newsize = strlen( $text );
$lastRevision = 0;
+ $revisionId = 0;
if ( 0 != strcmp( $text, $oldtext ) ) {
- $this->mGoodAdjustment = $this->isCountable( $text )
- - $this->isCountable( $oldtext );
+ $this->mGoodAdjustment = (int)$this->isCountable( $text )
+ - (int)$this->isCountable( $oldtext );
$this->mTotalAdjustment = 0;
$now = wfTimestampNow();
@@ -1272,7 +1395,7 @@ class Article {
'minor_edit' => $isminor,
'text' => $text
) );
-
+
$dbw->immediateCommit();
$dbw->begin();
$revisionId = $revision->insertOn( $dbw );
@@ -1286,13 +1409,19 @@ class Article {
$dbw->rollback();
} else {
# Update recentchanges and purge cache and whatnot
+ require_once( 'RecentChange.php' );
$bot = (int)($wgUser->isBot() || $forceBot);
RecentChange::notifyEdit( $now, $this->mTitle, $isminor, $wgUser, $summary,
$lastRevision, $this->getTimestamp(), $bot, '', $oldsize, $newsize,
$revisionId );
- Article::onArticleEdit( $this->mTitle );
$dbw->commit();
+
+ // Update caches outside the main transaction
+ Article::onArticleEdit( $this->mTitle );
}
+ } else {
+ // Keep the same revision ID, but do some updates on it
+ $revisionId = $this->getRevIdFetched();
}
if( !$wgDBtransactions ) {
@@ -1304,32 +1433,32 @@ class Article {
if (!$this->mTitle->userIsWatching()) {
$dbw->immediateCommit();
$dbw->begin();
- $this->watch();
+ $this->doWatch();
$dbw->commit();
}
} else {
if ( $this->mTitle->userIsWatching() ) {
$dbw->immediateCommit();
$dbw->begin();
- $this->unwatch();
+ $this->doUnwatch();
$dbw->commit();
}
}
# standard deferred updates
- $this->editUpdates( $text, $summary, $minor, $now );
+ $this->editUpdates( $text, $summary, $minor, $now, $revisionId );
$urls = array();
+ # Invalidate caches of all articles using this article as a template
+
# Template namespace
# Purge all articles linking here
- if ( $this->mTitle->getNamespace() == NS_TEMPLATE) {
- $titles = $this->mTitle->getLinksTo();
- Title::touchArray( $titles );
- if ( $wgUseSquid ) {
- foreach ( $titles as $title ) {
- $urls[] = $title->getInternalURL();
- }
- }
+ $titles = $this->mTitle->getTemplateLinksTo();
+ Title::touchArray( $titles );
+ if ( $wgUseSquid ) {
+ foreach ( $titles as $title ) {
+ $urls[] = $title->getInternalURL();
+ }
}
# Squid updates
@@ -1360,56 +1489,18 @@ class Article {
* the link tables and redirect to the new page.
*/
function showArticle( $text, $subtitle , $sectionanchor = '', $me2, $now, $summary, $oldid ) {
- global $wgUseDumbLinkUpdate, $wgAntiLockFlags, $wgOut, $wgUser, $wgLinkCache, $wgEnotif;
- global $wgUseEnotif;
+ global $wgOut;
$fname = 'Article::showArticle';
wfProfileIn( $fname );
- $wgLinkCache = new LinkCache();
-
- if ( !$wgUseDumbLinkUpdate ) {
- # Preload links to reduce lock time
- if ( $wgAntiLockFlags & ALF_PRELOAD_LINKS ) {
- $wgLinkCache->preFill( $this->mTitle );
- $wgLinkCache->clear();
- }
- }
-
- # Parse the text and replace links with placeholders
- $wgOut = new OutputPage();
-
- # Pass the current title along in case we're creating a wiki page
- # which is different than the currently displayed one (e.g. image
- # pages created on file uploads); otherwise, link updates will
- # go wrong.
- $wgOut->addWikiTextWithTitle( $text, $this->mTitle );
-
- if ( !$wgUseDumbLinkUpdate ) {
- # Move the current links back to the second register
- $wgLinkCache->swapRegisters();
-
- # Get old version of link table to allow incremental link updates
- # Lock this data now since it is needed for an update
- $wgLinkCache->forUpdate( true );
- $wgLinkCache->preFill( $this->mTitle );
-
- # Swap this old version back into its rightful place
- $wgLinkCache->swapRegisters();
- }
-
+ # Output the redirect
if( $this->isRedirect( $text ) )
$r = 'redirect=no';
else
$r = '';
$wgOut->redirect( $this->mTitle->getFullURL( $r ).$sectionanchor );
- if ( $wgUseEnotif ) {
- # this would be better as an extension hook
- include_once( "UserMailer.php" );
- $wgEnotif = new EmailNotification ();
- $wgEnotif->notifyOnPageChange( $this->mTitle, $now, $summary, $me2, $oldid );
- }
wfProfileOut( $fname );
}
@@ -1420,28 +1511,33 @@ class Article {
global $wgOut, $wgRequest, $wgOnlySysopsCanPatrol, $wgUseRCPatrol, $wgUser;
$wgOut->setRobotpolicy( 'noindex,follow' );
- if ( !$wgUseRCPatrol )
- {
- $wgOut->errorpage( 'rcpatroldisabled', 'rcpatroldisabledtext' );
+ # Check RC patrol config. option
+ if( !$wgUseRCPatrol ) {
+ $wgOut->errorPage( 'rcpatroldisabled', 'rcpatroldisabledtext' );
return;
}
- if ( $wgUser->isAnon() )
- {
+
+ # Check permissions
+ if( $wgUser->isLoggedIn() ) {
+ if( !$wgUser->isAllowed( 'patrol' ) ) {
+ $wgOut->permissionRequired( 'patrol' );
+ return;
+ }
+ } else {
$wgOut->loginToUse();
return;
}
- if ( $wgOnlySysopsCanPatrol && !$wgUser->isAllowed('patrol') )
- {
- $wgOut->sysopRequired();
- return;
- }
+
$rcid = $wgRequest->getVal( 'rcid' );
if ( !is_null ( $rcid ) )
{
- RecentChange::markPatrolled( $rcid );
- $wgOut->setPagetitle( wfMsg( 'markedaspatrolled' ) );
- $wgOut->addWikiText( wfMsg( 'markedaspatrolledtext' ) );
-
+ if( wfRunHooks( 'MarkPatrolled', array( &$rcid, &$wgUser, $wgOnlySysopsCanPatrol ) ) ) {
+ require_once( 'RecentChange.php' );
+ RecentChange::markPatrolled( $rcid );
+ wfRunHooks( 'MarkPatrolledComplete', array( &$rcid, &$wgUser, $wgOnlySysopsCanPatrol ) );
+ $wgOut->setPagetitle( wfMsg( 'markedaspatrolled' ) );
+ $wgOut->addWikiText( wfMsg( 'markedaspatrolledtext' ) );
+ }
$rcTitle = Title::makeTitle( NS_SPECIAL, 'Recentchanges' );
$wgOut->returnToMain( false, $rcTitle->getPrefixedText() );
}
@@ -1452,35 +1548,7 @@ class Article {
}
/**
- * Validate function
- */
- function validate() {
- global $wgOut, $wgUser, $wgRequest, $wgUseValidation;
-
- if ( !$wgUseValidation ) # Are we using article validation at all?
- {
- $wgOut->errorpage( "nosuchspecialpage", "nospecialpagetext" );
- return ;
- }
-
- $wgOut->setRobotpolicy( 'noindex,follow' );
- $revision = $wgRequest->getVal( 'revision' );
-
- include_once ( "SpecialValidate.php" ) ; # The "Validation" class
-
- $v = new Validation ;
- if ( $wgRequest->getVal ( "mode" , "" ) == "list" )
- $t = $v->showList ( $this ) ;
- else if ( $wgRequest->getVal ( "mode" , "" ) == "details" )
- $t = $v->showDetails ( $this , $wgRequest->getVal( 'revision' ) ) ;
- else
- $t = $v->validatePageForm ( $this , $revision ) ;
-
- $wgOut->addHTML ( $t ) ;
- }
-
- /**
- * Add this page to $wgUser's watchlist
+ * User-interface handler for the "watch" action
*/
function watch() {
@@ -1495,14 +1563,8 @@ class Article {
$wgOut->readOnlyPage();
return;
}
-
- if (wfRunHooks('WatchArticle', array(&$wgUser, &$this))) {
-
- $wgUser->addWatch( $this->mTitle );
- $wgUser->saveSettings();
-
- wfRunHooks('WatchArticleComplete', array(&$wgUser, &$this));
-
+
+ if( $this->doWatch() ) {
$wgOut->setPagetitle( wfMsg( 'addedwatch' ) );
$wgOut->setRobotpolicy( 'noindex,follow' );
@@ -1513,11 +1575,30 @@ class Article {
$wgOut->returnToMain( true, $this->mTitle->getPrefixedText() );
}
-
+
/**
- * Stop watching a page
+ * Add this page to $wgUser's watchlist
+ * @return bool true on successful watch operation
*/
+ function doWatch() {
+ global $wgUser;
+ if( $wgUser->isAnon() ) {
+ return false;
+ }
+
+ if (wfRunHooks('WatchArticle', array(&$wgUser, &$this))) {
+ $wgUser->addWatch( $this->mTitle );
+ $wgUser->saveSettings();
+ return wfRunHooks('WatchArticleComplete', array(&$wgUser, &$this));
+ }
+
+ return false;
+ }
+
+ /**
+ * User interface handler for the "unwatch" action.
+ */
function unwatch() {
global $wgUser, $wgOut;
@@ -1530,14 +1611,8 @@ class Article {
$wgOut->readOnlyPage();
return;
}
-
- if (wfRunHooks('UnwatchArticle', array(&$wgUser, &$this))) {
-
- $wgUser->removeWatch( $this->mTitle );
- $wgUser->saveSettings();
-
- wfRunHooks('UnwatchArticleComplete', array(&$wgUser, &$this));
-
+
+ if( $this->doUnwatch() ) {
$wgOut->setPagetitle( wfMsg( 'removedwatch' ) );
$wgOut->setRobotpolicy( 'noindex,follow' );
@@ -1548,156 +1623,120 @@ class Article {
$wgOut->returnToMain( true, $this->mTitle->getPrefixedText() );
}
+
+ /**
+ * Stop watching a page
+ * @return bool true on successful unwatch
+ */
+ function doUnwatch() {
+ global $wgUser;
+ if( $wgUser->isAnon() ) {
+ return false;
+ }
+
+ if (wfRunHooks('UnwatchArticle', array(&$wgUser, &$this))) {
+ $wgUser->removeWatch( $this->mTitle );
+ $wgUser->saveSettings();
+
+ return wfRunHooks('UnwatchArticleComplete', array(&$wgUser, &$this));
+ }
+
+ return false;
+ }
/**
- * protect a page
+ * action=protect handler
*/
- function protect( $limit = 'sysop' ) {
- global $wgUser, $wgOut, $wgRequest;
+ function protect() {
+ require_once 'ProtectionForm.php';
+ $form = new ProtectionForm( $this );
+ $form->show();
+ }
- if ( ! $wgUser->isAllowed('protect') ) {
- $wgOut->sysopRequired();
- return;
+ /**
+ * action=unprotect handler (alias)
+ */
+ function unprotect() {
+ $this->protect();
+ }
+
+ /**
+ * Update the article's restriction field, and leave a log entry.
+ *
+ * @param array $limit set of restriction keys
+ * @param string $reason
+ * @return bool true on success
+ */
+ function updateRestrictions( $limit = array(), $reason = '' ) {
+ global $wgUser;
+
+ if ( !$wgUser->isAllowed( 'protect' ) ) {
+ return false;
}
- if ( wfReadOnly() ) {
- $wgOut->readOnlyPage();
- return;
+
+ if( wfReadOnly() ) {
+ return false;
}
+
$id = $this->mTitle->getArticleID();
if ( 0 == $id ) {
- $wgOut->fatalError( wfMsg( 'badarticleerror' ) );
- return;
+ return false;
}
- $confirm = $wgRequest->wasPosted() &&
- $wgUser->matchEditToken( $wgRequest->getVal( 'wpEditToken' ) );
- $moveonly = $wgRequest->getBool( 'wpMoveOnly' );
- $reason = $wgRequest->getText( 'wpReasonProtect' );
+ $flat = Article::flattenRestrictions( $limit );
+ $protecting = ($flat != '');
+
+ if( wfRunHooks( 'ArticleProtect', array( &$this, &$wgUser,
+ $limit, $reason ) ) ) {
- if ( $confirm ) {
$dbw =& wfGetDB( DB_MASTER );
$dbw->update( 'page',
array( /* SET */
'page_touched' => $dbw->timestamp(),
- 'page_restrictions' => (string)$limit
+ 'page_restrictions' => $flat
), array( /* WHERE */
'page_id' => $id
), 'Article::protect'
);
- $restrictions = "move=" . $limit;
- if( !$moveonly ) {
- $restrictions .= ":edit=" . $limit;
- }
- if (wfRunHooks('ArticleProtect', array(&$this, &$wgUser, $limit == 'sysop', $reason, $moveonly))) {
+ wfRunHooks( 'ArticleProtectComplete', array( &$this, &$wgUser,
+ $limit, $reason ) );
- $dbw =& wfGetDB( DB_MASTER );
- $dbw->update( 'page',
- array( /* SET */
- 'page_touched' => $dbw->timestamp(),
- 'page_restrictions' => $restrictions
- ), array( /* WHERE */
- 'page_id' => $id
- ), 'Article::protect'
- );
-
- wfRunHooks('ArticleProtectComplete', array(&$this, &$wgUser, $limit == 'sysop', $reason, $moveonly));
-
- $log = new LogPage( 'protect' );
- if ( $limit === '' ) {
- $log->addEntry( 'unprotect', $this->mTitle, $reason );
- } else {
- $log->addEntry( 'protect', $this->mTitle, $reason );
- }
- $wgOut->redirect( $this->mTitle->getFullURL() );
+ $log = new LogPage( 'protect' );
+ if( $protecting ) {
+ $log->addEntry( 'protect', $this->mTitle, trim( $reason . " [$flat]" ) );
+ } else {
+ $log->addEntry( 'unprotect', $this->mTitle, $reason );
}
- return;
- } else {
- return $this->confirmProtect( '', '', $limit );
}
+ return true;
}
/**
- * Output protection confirmation dialog
+ * Take an array of page restrictions and flatten it to a string
+ * suitable for insertion into the page_restrictions field.
+ * @param array $limit
+ * @return string
+ * @access private
*/
- function confirmProtect( $par, $reason, $limit = 'sysop' ) {
- global $wgOut, $wgUser;
-
- wfDebug( "Article::confirmProtect\n" );
-
- $sub = htmlspecialchars( $this->mTitle->getPrefixedText() );
- $wgOut->setRobotpolicy( 'noindex,nofollow' );
-
- $check = '';
- $protcom = '';
- $moveonly = '';
-
- if ( $limit === '' ) {
- $wgOut->setPageTitle( wfMsg( 'confirmunprotect' ) );
- $wgOut->setSubtitle( wfMsg( 'unprotectsub', $sub ) );
- $wgOut->addWikiText( wfMsg( 'confirmunprotecttext' ) );
- $protcom = htmlspecialchars( wfMsg( 'unprotectcomment' ) );
- $formaction = $this->mTitle->escapeLocalURL( 'action=unprotect' . $par );
- } else {
- $wgOut->setPageTitle( wfMsg( 'confirmprotect' ) );
- $wgOut->setSubtitle( wfMsg( 'protectsub', $sub ) );
- $wgOut->addWikiText( wfMsg( 'confirmprotecttext' ) );
- $moveonly = htmlspecialchars( wfMsg( 'protectmoveonly' ) );
- $protcom = htmlspecialchars( wfMsg( 'protectcomment' ) );
- $formaction = $this->mTitle->escapeLocalURL( 'action=protect' . $par );
- }
-
- $confirm = htmlspecialchars( wfMsg( 'confirm' ) );
- $token = htmlspecialchars( $wgUser->editToken() );
-
- $wgOut->addHTML( "
-" );
-
- $wgOut->returnToMain( false );
- }
-
- /**
- * Unprotect the pages
- */
- function unprotect() {
- return $this->protect( '' );
+ return implode( ':', $bits );
}
/*
* UI entry point for page deletion
*/
function delete() {
- global $wgUser, $wgOut, $wgMessageCache, $wgRequest;
+ global $wgUser, $wgOut, $wgRequest;
$fname = 'Article::delete';
$confirm = $wgRequest->wasPosted() &&
$wgUser->matchEditToken( $wgRequest->getVal( 'wpEditToken' ) );
@@ -1706,18 +1745,28 @@ class Article {
# This code desperately needs to be totally rewritten
# Check permissions
- if( ( !$wgUser->isAllowed( 'delete' ) ) ) {
- $wgOut->sysopRequired();
+ if( $wgUser->isAllowed( 'delete' ) ) {
+ if( $wgUser->isBlocked() ) {
+ $wgOut->blockedPage();
+ return;
+ }
+ } else {
+ $wgOut->permissionRequired( 'delete' );
return;
}
+
if( wfReadOnly() ) {
$wgOut->readOnlyPage();
return;
}
- # Better double-check that it hasn't been deleted yet!
$wgOut->setPagetitle( wfMsg( 'confirmdelete' ) );
- if( !$this->mTitle->exists() ) {
+
+ # Better double-check that it hasn't been deleted yet!
+ $dbw =& wfGetDB( DB_MASTER );
+ $conds = $this->mTitle->pageCond();
+ $latest = $dbw->selectField( 'page', 'page_latest', $conds, $fname );
+ if ( $latest === false ) {
$wgOut->fatalError( wfMsg( 'cannotdelete' ) );
return;
}
@@ -1729,38 +1778,30 @@ class Article {
# determine whether this page has earlier revisions
# and insert a warning if it does
- # we select the text because it might be useful below
- $dbr =& $this->getDB();
- $ns = $this->mTitle->getNamespace();
- $title = $this->mTitle->getDBkey();
- $revisions = $dbr->select( array( 'page', 'revision' ),
- array( 'rev_id', 'rev_user_text' ),
- array(
- 'page_namespace' => $ns,
- 'page_title' => $title,
- 'rev_page = page_id'
- ), $fname, $this->getSelectOptions( array( 'ORDER BY' => 'rev_timestamp DESC' ) )
- );
-
- if( $dbr->numRows( $revisions ) > 1 && !$confirm ) {
+ $maxRevisions = 20;
+ $authors = $this->getLastNAuthors( $maxRevisions, $latest );
+
+ if( count( $authors ) > 1 && !$confirm ) {
$skin=$wgUser->getSkin();
$wgOut->addHTML(''.wfMsg('historywarning'));
$wgOut->addHTML( $skin->historyLink() .'');
}
- # Fetch cur_text
- $rev = Revision::newFromTitle( $this->mTitle );
-
- # Fetch name(s) of contributors
- $rev_name = '';
- $all_same_user = true;
- while( $row = $dbr->fetchObject( $revisions ) ) {
- if( $rev_name != '' && $rev_name != $row->rev_user_text ) {
- $all_same_user = false;
- } else {
- $rev_name = $row->rev_user_text;
+ # If a single user is responsible for all revisions, find out who they are
+ if ( count( $authors ) == $maxRevisions ) {
+ // Query bailed out, too many revisions to find out if they're all the same
+ $authorOfAll = false;
+ } else {
+ $authorOfAll = reset( $authors );
+ foreach ( $authors as $author ) {
+ if ( $authorOfAll != $author ) {
+ $authorOfAll = false;
+ break;
+ }
}
}
+ # Fetch article text
+ $rev = Revision::newFromTitle( $this->mTitle );
if( !is_null( $rev ) ) {
# if this is a mini-text, we can paste part of it into the deletion reason
@@ -1794,10 +1835,10 @@ class Article {
$text = preg_replace( "/[\n\r]/", '', $text );
if( !$blanked ) {
- if( !$all_same_user ) {
+ if( $authorOfAll === false ) {
$reason = wfMsgForContent( 'excontent', $text );
} else {
- $reason = wfMsgForContent( 'excontentauthor', $text, $rev_name );
+ $reason = wfMsgForContent( 'excontentauthor', $text, $authorOfAll );
}
} else {
$reason = wfMsgForContent( 'exbeforeblank', $text );
@@ -1808,6 +1849,53 @@ class Article {
return $this->confirmDelete( '', $reason );
}
+ /**
+ * Get the last N authors
+ * @param int $num Number of revisions to get
+ * @param string $revLatest The latest rev_id, selected from the master (optional)
+ * @return array Array of authors, duplicates not removed
+ */
+ function getLastNAuthors( $num, $revLatest = 0 ) {
+ $fname = 'Article::getLastNAuthors';
+ wfProfileIn( $fname );
+
+ // First try the slave
+ // 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' ),
+ array(
+ 'page_namespace' => $this->mTitle->getNamespace(),
+ 'page_title' => $this->mTitle->getDBkey(),
+ 'rev_page = page_id'
+ ), $fname, $this->getSelectOptions( array(
+ 'ORDER BY' => 'rev_timestamp DESC',
+ 'LIMIT' => $num
+ ) )
+ );
+ if ( !$res ) {
+ wfProfileOut( $fname );
+ return array();
+ }
+ $row = $db->fetchObject( $res );
+ if ( $continue == 2 && $revLatest && $row->rev_id != $revLatest ) {
+ $db =& wfGetDB( DB_MASTER );
+ $continue--;
+ } else {
+ $continue = 0;
+ }
+ } while ( $continue );
+
+ $authors = array( $row->rev_user_text );
+ while ( $row = $db->fetchObject( $res ) ) {
+ $authors[] = $row->rev_user_text;
+ }
+ wfProfileOut( $fname );
+ return $authors;
+ }
+
/**
* Output deletion confirmation dialog
*/
@@ -1823,7 +1911,7 @@ class Article {
$formaction = $this->mTitle->escapeLocalURL( 'action=delete' . $par );
- $confirm = htmlspecialchars( wfMsg( 'confirm' ) );
+ $confirm = htmlspecialchars( wfMsg( 'deletepage' ) );
$delcom = htmlspecialchars( wfMsg( 'deletecomment' ) );
$token = htmlspecialchars( $wgUser->editToken() );
@@ -1856,7 +1944,7 @@ class Article {
* Perform a deletion and output success or failure messages
*/
function doDelete( $reason ) {
- global $wgOut, $wgUser, $wgContLang;
+ global $wgOut, $wgUser;
$fname = 'Article::doDelete';
wfDebug( $fname."\n" );
@@ -1885,9 +1973,8 @@ class Article {
* Returns success
*/
function doDeleteArticle( $reason ) {
- global $wgUser;
- global $wgUseSquid, $wgDeferredUpdateList, $wgInternalServer, $wgPostCommitUpdateList;
- global $wgUseTrackbacks;
+ global $wgUseSquid, $wgDeferredUpdateList;
+ global $wgPostCommitUpdateList, $wgUseTrackbacks;
$fname = 'Article::doDeleteArticle';
wfDebug( $fname."\n" );
@@ -1901,7 +1988,7 @@ class Article {
return false;
}
- $u = new SiteStatsUpdate( 0, 1, -$this->isCountable( $this->getContent( true ) ), -1 );
+ $u = new SiteStatsUpdate( 0, 1, -(int)$this->isCountable( $this->getContent() ), -1 );
array_push( $wgDeferredUpdateList, $u );
$linksTo = $this->mTitle->getLinksTo();
@@ -1968,6 +2055,8 @@ class Article {
$dbw->delete( 'pagelinks', array( 'pl_from' => $id ) );
$dbw->delete( 'imagelinks', array( 'il_from' => $id ) );
$dbw->delete( 'categorylinks', array( 'cl_from' => $id ) );
+ $dbw->delete( 'templatelinks', array( 'tl_from' => $id ) );
+ $dbw->delete( 'externallinks', array( 'el_from' => $id ) );
# Log the deletion
$log = new LogPage( 'delete' );
@@ -1983,15 +2072,21 @@ class Article {
* Revert a modification
*/
function rollback() {
- global $wgUser, $wgOut, $wgRequest;
+ global $wgUser, $wgOut, $wgRequest, $wgUseRCPatrol;
$fname = 'Article::rollback';
- if ( ! $wgUser->isAllowed('rollback') ) {
- $wgOut->sysopRequired();
+ if( $wgUser->isAllowed( 'rollback' ) ) {
+ if( $wgUser->isBlocked() ) {
+ $wgOut->blockedPage();
+ return;
+ }
+ } else {
+ $wgOut->permissionRequired( 'rollback' );
return;
}
+
if ( wfReadOnly() ) {
- $wgOut->readOnlyPage( $this->getContent( true ) );
+ $wgOut->readOnlyPage( $this->getContent() );
return;
}
if( !$wgUser->matchEditToken( $wgRequest->getVal( 'token' ),
@@ -2056,12 +2151,19 @@ class Article {
return;
}
+ $set = array();
if ( $bot ) {
# Mark all reverted edits as bot
- $dbw->update( 'recentchanges',
- array( /* SET */
- 'rc_bot' => 1
- ), array( /* WHERE */
+ $set['rc_bot'] = 1;
+ }
+ if ( $wgUseRCPatrol ) {
+ # Mark all reverted edits as patrolled
+ $set['rc_patrolled'] = 1;
+ }
+
+ if ( $set ) {
+ $dbw->update( 'recentchanges', $set,
+ array( /* WHERE */
'rc_cur_id' => $current->getPage(),
'rc_user_text' => $current->getUserText(),
"rc_timestamp > '{$s->rev_timestamp}'",
@@ -2069,15 +2171,17 @@ class Article {
);
}
- # Save it!
+ # Get the edit summary
$target = Revision::newFromId( $s->rev_id );
- $newcomment = wfMsgForContent( 'revertpage', $target->getUserText(), $from );
+ $newComment = wfMsgForContent( 'revertpage', $target->getUserText(), $from );
+ $newComment = $wgRequest->getText( 'summary', $newComment );
+ # Save it!
$wgOut->setPagetitle( wfMsg( 'actioncomplete' ) );
$wgOut->setRobotpolicy( 'noindex,nofollow' );
- $wgOut->addHTML( '' . htmlspecialchars( $newcomment ) . "
\n
\n" );
+ $wgOut->addHTML( '' . htmlspecialchars( $newComment ) . "
\n
\n" );
- $this->updateArticle( $target->getText(), $newcomment, 1, $this->mTitle->userIsWatching(), $bot );
+ $this->updateArticle( $target->getText(), $newComment, 1, $this->mTitle->userIsWatching(), $bot );
Article::onArticleEdit( $this->mTitle );
$dbw->commit();
@@ -2087,10 +2191,10 @@ class Article {
/**
* Do standard deferred updates after page view
- * @private
+ * @access private
*/
function viewUpdates() {
- global $wgDeferredUpdateList, $wgUseEnotif;
+ global $wgDeferredUpdateList;
if ( 0 != $this->getID() ) {
global $wgDisableCounters;
@@ -2101,91 +2205,94 @@ class Article {
}
}
- # Update newtalk status if user is reading their own
- # talk page
-
+ # Update newtalk / watchlist notification status
global $wgUser;
- if ($this->mTitle->getNamespace() == NS_USER_TALK &&
- $this->mTitle->getText() == $wgUser->getName())
- {
- if ( $wgUseEnotif ) {
- require_once( 'UserTalkUpdate.php' );
- $u = new UserTalkUpdate( 0, $this->mTitle->getNamespace(), $this->mTitle->getDBkey(), false, false, false );
- } else {
- $wgUser->setNewtalk(0);
- $wgUser->saveNewtalk();
- }
- } elseif ( $wgUseEnotif ) {
- $wgUser->clearNotification( $this->mTitle );
- }
-
+ $wgUser->clearNotification( $this->mTitle );
}
/**
* Do standard deferred updates after page edit.
* Every 1000th edit, prune the recent changes table.
- * @private
+ * @access private
* @param string $text
*/
- function editUpdates( $text, $summary, $minoredit, $timestamp_of_pagechange) {
- global $wgDeferredUpdateList, $wgDBname, $wgMemc;
- global $wgMessageCache, $wgUser, $wgUseEnotif;
+ function editUpdates( $text, $summary, $minoredit, $timestamp_of_pagechange, $newid) {
+ global $wgDeferredUpdateList, $wgMessageCache, $wgUser, $wgParser;
- wfSeedRandom();
- if ( 0 == mt_rand( 0, 999 ) ) {
- # Periodically flush old entries from the recentchanges table.
- 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 ); // HACK: disabled for now, slowness
+ $fname = 'Article::editUpdates';
+ wfProfileIn( $fname );
+
+ # Parse the text
+ $options = new ParserOptions;
+ $options->setTidy(true);
+ $poutput = $wgParser->parse( $text, $this->mTitle, $options, true, true, $newid );
+
+ # Save it to the parser cache
+ $parserCache =& ParserCache::singleton();
+ $parserCache->save( $poutput, $this, $wgUser );
- // re-enabled for commit of unrelated live changes -- TS
- $dbw->query( $sql );
+ # Update the links tables
+ $u = new LinksUpdate( $this->mTitle, $poutput );
+ $u->doUpdate();
+
+ if ( wfRunHooks( 'ArticleEditUpdatesDeleteFromRecentchanges', array( &$this ) ) ) {
+ wfSeedRandom();
+ if ( 0 == mt_rand( 0, 999 ) ) {
+ # Periodically flush old entries from the recentchanges table.
+ 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 );
+ }
}
+
$id = $this->getID();
$title = $this->mTitle->getPrefixedDBkey();
$shortTitle = $this->mTitle->getDBkey();
- if ( 0 != $id ) {
- $u = new LinksUpdate( $id, $title );
- array_push( $wgDeferredUpdateList, $u );
- $u = new SiteStatsUpdate( 0, 1, $this->mGoodAdjustment, $this->mTotalAdjustment );
- array_push( $wgDeferredUpdateList, $u );
- $u = new SearchUpdate( $id, $title, $text );
- array_push( $wgDeferredUpdateList, $u );
-
- # If this is another user's talk page, update newtalk
-
- if ($this->mTitle->getNamespace() == NS_USER_TALK && $shortTitle != $wgUser->getName()) {
- if ( $wgUseEnotif ) {
- require_once( 'UserTalkUpdate.php' );
- $u = new UserTalkUpdate( 1, $this->mTitle->getNamespace(), $shortTitle, $summary,
- $minoredit, $timestamp_of_pagechange);
- } else {
- $other = User::newFromName( $shortTitle );
- if( is_null( $other ) && User::isIP( $shortTitle ) ) {
- // An anonymous user
- $other = new User();
- $other->setName( $shortTitle );
- }
- if( $other ) {
- $other->setNewtalk(1);
- $other->saveNewtalk();
- }
+ if ( 0 == $id ) {
+ wfProfileOut( $fname );
+ return;
+ }
+
+ $u = new SiteStatsUpdate( 0, 1, $this->mGoodAdjustment, $this->mTotalAdjustment );
+ array_push( $wgDeferredUpdateList, $u );
+ $u = new SearchUpdate( $id, $title, $text );
+ array_push( $wgDeferredUpdateList, $u );
+
+ # If this is another user's talk page, update newtalk
+
+ if ($this->mTitle->getNamespace() == NS_USER_TALK && $shortTitle != $wgUser->getName()) {
+ if (wfRunHooks('ArticleEditUpdateNewTalk', array(&$this)) ) {
+ $other = User::newFromName( $shortTitle );
+ if( is_null( $other ) && User::isIP( $shortTitle ) ) {
+ // An anonymous user
+ $other = new User();
+ $other->setName( $shortTitle );
+ }
+ if( $other ) {
+ $other->setNewtalk( true );
}
}
+ }
- if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
- $wgMessageCache->replace( $shortTitle, $text );
- }
+ if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
+ $wgMessageCache->replace( $shortTitle, $text );
}
+
+ wfProfileOut( $fname );
}
/**
- * @todo document this function
- * @private
+ * Generate the navigation links when browsing through an article revisions
+ * It shows the information as:
+ * Revision as of ; view current revision
+ * <- Previous version | Next Version ->
+ *
+ * @access private
* @param string $oldid Revision ID of this article revision
*/
function setOldSubtitle( $oldid=0 ) {
@@ -2197,7 +2304,10 @@ class Article {
$lnk = $current
? wfMsg( 'currentrevisionlink' )
: $lnk = $sk->makeKnownLinkObj( $this->mTitle, wfMsg( 'currentrevisionlink' ) );
- $prevlink = $sk->makeKnownLinkObj( $this->mTitle, wfMsg( 'previousrevision' ), 'direction=prev&oldid='.$oldid );
+ $prev = $this->mTitle->getPreviousRevisionID( $oldid ) ;
+ $prevlink = $prev
+ ? $sk->makeKnownLinkObj( $this->mTitle, wfMsg( 'previousrevision' ), 'direction=prev&oldid='.$oldid )
+ : wfMsg( 'previousrevision' );
$nextlink = $current
? wfMsg( 'nextrevision' )
: $sk->makeKnownLinkObj( $this->mTitle, wfMsg( 'nextrevision' ), 'direction=next&oldid='.$oldid );
@@ -2234,7 +2344,6 @@ class Article {
$touched = $this->mTouched;
$cache = new CacheManager( $this->mTitle );
if($cache->isFileCacheGood( $touched )) {
- global $wgOut;
wfDebug( " tryFileCache() - about to load\n" );
$cache->loadFromFileCache();
return true;
@@ -2270,21 +2379,38 @@ class Article {
}
/**
- * Loads cur_touched and returns a value indicating if it should be used
+ * Loads page_touched and returns a value indicating if it should be used
*
*/
function checkTouched() {
$fname = 'Article::checkTouched';
if( !$this->mDataLoaded ) {
- $dbr =& $this->getDB();
- $data = $this->pageDataFromId( $dbr, $this->getId() );
- if( $data ) {
- $this->loadPageData( $data );
- }
+ $this->loadPageData();
}
return !$this->mIsRedirect;
}
+ /**
+ * Get the page_touched field
+ */
+ function getTouched() {
+ # Ensure that page data has been loaded
+ if( !$this->mDataLoaded ) {
+ $this->loadPageData();
+ }
+ return $this->mTouched;
+ }
+
+ /**
+ * Get the page_latest field
+ */
+ function getLatest() {
+ if ( !$this->mDataLoaded ) {
+ $this->loadPageData();
+ }
+ return $this->mLatest;
+ }
+
/**
* Edit an article without doing all that other stuff
* The article must already exist; link tables etc
@@ -2353,7 +2479,7 @@ class Article {
$old_user_abort = ignore_user_abort( true );
$dbw->query("LOCK TABLES $hitcounterTable WRITE");
- $dbw->query("CREATE TEMPORARY TABLE $acchitsTable TYPE=HEAP ".
+ $dbw->query("CREATE TEMPORARY TABLE $acchitsTable ENGINE=HEAP ".
"SELECT hc_id,COUNT(*) AS hc_n FROM $hitcounterTable ".
'GROUP BY hc_id');
$dbw->query("DELETE FROM $hitcounterTable");
@@ -2399,17 +2525,46 @@ class Article {
function onArticleDelete( $title ) {
global $wgMessageCache;
-
+
$title->touchLinks();
-
+
if( $title->getNamespace() == NS_MEDIAWIKI) {
$wgMessageCache->replace( $title->getDBkey(), false );
}
}
- function onArticleEdit($title_obj) {
- // This would be an appropriate place to purge caches.
- // Why's this not in here now?
+ /**
+ * Purge caches on page update etc
+ */
+ function onArticleEdit( $title ) {
+ global $wgUseSquid, $wgPostCommitUpdateList, $wgUseFileCache;
+
+ $urls = array();
+
+ // Template namespace? Purge all articles linking here.
+ // FIXME: When a templatelinks table arrives, use it for all includes.
+ if ( $title->getNamespace() == NS_TEMPLATE) {
+ $titles = $title->getLinksTo();
+ Title::touchArray( $titles );
+ if ( $wgUseSquid ) {
+ foreach ( $titles as $link ) {
+ $urls[] = $link->getInternalURL();
+ }
+ }
+ }
+
+ # Squid updates
+ if ( $wgUseSquid ) {
+ $urls = array_merge( $urls, $title->getSquidURLs() );
+ $u = new SquidUpdate( $urls );
+ array_push( $wgPostCommitUpdateList, $u );
+ }
+
+ # File cache
+ if ( $wgUseFileCache ) {
+ $cm = new CacheManager( $title );
+ @unlink( $cm->fileCacheName() );
+ }
}
/**#@-*/
@@ -2437,9 +2592,13 @@ class Article {
# first, see if the page exists at all.
$exists = $page->getArticleId() != 0;
if( !$exists ) {
- $wgOut->addHTML( wfMsg( $wgUser->isLoggedIn() ? 'noarticletext' : 'noarticletextanon' ) );
+ if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
+ $wgOut->addHTML(wfMsgWeirdKey ( $this->mTitle->getText() ) );
+ } else {
+ $wgOut->addHTML(wfMsg( $wgUser->isLoggedIn() ? 'noarticletext' : 'noarticletextanon' ) );
+ }
} else {
- $dbr =& $this->getDB( DB_SLAVE );
+ $dbr =& wfGetDB( DB_SLAVE );
$wl_clause = array(
'wl_title' => $page->getDBkey(),
'wl_namespace' => $page->getNamespace() );
@@ -2481,7 +2640,7 @@ class Article {
return false;
}
- $dbr =& $this->getDB( DB_SLAVE );
+ $dbr =& wfGetDB( DB_SLAVE );
$rev_clause = array( 'rev_page' => $id );
$fname = 'Article::pageCountInfo';
@@ -2505,29 +2664,30 @@ class Article {
/**
* Return a list of templates used by this article.
- * Uses the links table to find the templates
+ * Uses the templatelinks table
*
- * @return array
+ * @return array Array of Title objects
*/
function getUsedTemplates() {
$result = array();
$id = $this->mTitle->getArticleID();
+ if( $id == 0 ) {
+ return array();
+ }
- $db =& wfGetDB( DB_SLAVE );
- $res = $db->select( array( 'pagelinks' ),
- array( 'pl_title' ),
- array(
- 'pl_from' => $id,
- 'pl_namespace' => NS_TEMPLATE ),
+ $dbr =& wfGetDB( DB_SLAVE );
+ $res = $dbr->select( array( 'templatelinks' ),
+ array( 'tl_namespace', 'tl_title' ),
+ array( 'tl_from' => $id ),
'Article:getUsedTemplates' );
if ( false !== $res ) {
- if ( $db->numRows( $res ) ) {
- while ( $row = $db->fetchObject( $res ) ) {
- $result[] = $row->pl_title;
+ if ( $dbr->numRows( $res ) ) {
+ while ( $row = $dbr->fetchObject( $res ) ) {
+ $result[] = Title::makeTitle( $row->tl_namespace, $row->tl_title );
}
}
}
- $db->freeResult( $res );
+ $dbr->freeResult( $res );
return $result;
}
}