.*?<\/h[1-6].*?>(?!\S)/mi',$subheadline,$matches);
$subhlevel=$matches[1];
if(strpos($subhlevel,'=')!==false) {
$subhlevel=strlen($subhlevel);
@@ -240,7 +291,8 @@ class Article {
}
/**
- * Return the oldid of the article that is to be shown, 0 for the current revision
+ * @return int The oldid of the article that is to be shown, 0 for the
+ * current revision
*/
function getOldID() {
if ( is_null( $this->mOldId ) ) {
@@ -250,8 +302,9 @@ class Article {
}
/**
- * Get the old ID from the request, return it.
* Sets $this->mRedirectUrl to a correct URL if the query parameters are incorrect
+ *
+ * @return int The old id for the request
*/
function getOldIDFromRequest() {
global $wgRequest;
@@ -285,14 +338,11 @@ class Article {
/**
* 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';
@@ -301,10 +351,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 );
}
@@ -336,15 +384,22 @@ class Article {
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 ) );
}
/**
@@ -354,30 +409,45 @@ 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 {
+ if ( is_object( $this->mTitle ) ) {
+ $lc->addBadLinkObj( $this->mTitle );
+ }
+ $this->mTitle->mArticleID = 0;
+ }
$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';
@@ -387,10 +457,6 @@ class Article {
if( $oldid ) {
$t .= ',oldid='.$oldid;
}
- if( isset( $redirect ) ) {
- $redirect = ($redirect == 'no') ? 'no' : 'yes';
- $t .= ',redirect='.$redirect;
- }
$this->mContent = wfMsg( 'missingarticle', $t ) ;
if( $oldid ) {
@@ -417,59 +483,15 @@ class Article {
}
$revision = Revision::newFromId( $this->mLatest );
if( is_null( $revision ) ) {
- wfDebug( "$fname failed to retrieve current page, rev_id $data->page_latest\n" );
+ wfDebug( "$fname failed to retrieve current page, rev_id {$data->page_latest}\n" );
return false;
}
}
- # 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;
- }
- }
- if( $rt->getInterwiki() == '' ) {
- $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();
+ // FIXME: Horrible, horrible! This content-loading interface just plain sucks.
+ // We should instead work with the Revision object when we need it...
+ $this->mContent = $revision->userCan( MW_REV_DELETED_TEXT ) ? $revision->getRawText() : "";
+ //$this->mContent = $revision->getText();
$this->mUser = $revision->getUser();
$this->mUserText = $revision->getUserText();
@@ -485,18 +507,10 @@ class Article {
return $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 );
- }
-
/**
* Read/write accessor to select FOR UPDATE
+ *
+ * @param mixed $x
*/
function forUpdate( $x = NULL ) {
return wfSetVar( $this->mForUpdate, $x );
@@ -504,21 +518,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 ) {
@@ -532,7 +545,7 @@ class Article {
}
/**
- * Return the Article ID
+ * @return int Page ID
*/
function getID() {
if( $this->mTitle ) {
@@ -543,44 +556,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 ) {
@@ -606,11 +626,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;
@@ -630,7 +648,10 @@ class Article {
}
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);
}
@@ -666,7 +687,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() );
@@ -699,7 +720,7 @@ class Article {
* the given title.
*/
function view() {
- global $wgUser, $wgOut, $wgRequest, $wgOnlySysopsCanPatrol, $wgContLang;
+ global $wgUser, $wgOut, $wgRequest, $wgContLang;
global $wgEnableParserCache, $wgStylePath, $wgUseRCPatrol, $wgParser;
global $wgUseTrackbacks;
$sk = $wgUser->getSkin();
@@ -742,7 +763,7 @@ class Article {
wfProfileOut( $fname );
return;
}
-
+
if ( empty( $oldid ) && $this->checkTouched() ) {
$wgOut->setETag($parserCache->getETag($this, $wgUser));
@@ -767,6 +788,30 @@ class Article {
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 ) ) {
@@ -774,21 +819,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 );
}
- if( isset( $redirect ) ) {
- $redirect = ($redirect == 'no') ? 'no' : 'yes';
- $t .= ',redirect='.$redirect;
- }
- $text = wfMsg( 'missingarticle', $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();
@@ -798,34 +841,23 @@ class Article {
# We're looking at an old revision
if ( !empty( $oldid ) ) {
- $this->setOldSubtitle( isset($this->mOldId) ? $this->mOldId : $oldid );
- $wgOut->setRobotpolicy( 'noindex,follow' );
- }
- $wasRedirected = false;
- if ( '' != $this->mRedirectedFrom ) {
- if ( wfRunHooks( 'ArticleViewRedirect', array( &$this ) ) ) {
- $sk = $wgUser->getSkin();
- $redir = $sk->makeKnownLink( $this->mRedirectedFrom, '', 'redirect=no' );
- $s = wfMsg( 'redirectedfrom', $redir );
- $wgOut->setSubtitle( $s );
-
- // Check the parser cache again, for the target page
- if( $pcache ) {
- if( $wgOut->tryParserCache( $this, $wgUser ) ) {
- $outputDone = true;
+ $wgOut->setRobotpolicy( 'noindex,nofollow' );
+ if( is_null( $this->mRevision ) ) {
+ // FIXME: This would be a nice place to load the 'no such page' text.
+ } else {
+ $this->setOldSubtitle( isset($this->mOldId) ? $this->mOldId : $oldid );
+ if( $this->mRevision->isDeleted( MW_REV_DELETED_TEXT ) ) {
+ if( !$this->mRevision->userCan( MW_REV_DELETED_TEXT ) ) {
+ $wgOut->addWikiText( wfMsg( 'rev-deleted-text-permission' ) );
+ $wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
+ return;
+ } else {
+ $wgOut->addWikiText( wfMsg( 'rev-deleted-text-view' ) );
+ // and we are allowed to see...
}
}
- $wasRedirected = true;
- }
- } 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 );
- $wasRedirected = true;
}
+
}
}
if( !$outputDone ) {
@@ -869,7 +901,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 );
@@ -881,15 +914,16 @@ class Article {
if( empty( $t ) ) {
$wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
}
+
+ # check if we're displaying a [[User talk:x.x.x.x]] anonymous talk page
+ if( $this->mTitle->getNamespace() == NS_USER_TALK &&
+ User::isIP( $this->mTitle->getText() ) ) {
+ $wgOut->addWikiText( wfMsg('anontalkpagetext') );
+ }
# If we have been passed an &rcid= parameter, we want to give the user a
# chance to mark this new article as patrolled.
- if ( $wgUseRCPatrol
- && !is_null($rcid)
- && $rcid != 0
- && $wgUser->isLoggedIn()
- && ( $wgUser->isAllowed('patrol') || !$wgOnlySysopsCanPatrol ) )
- {
+ if ( $wgUseRCPatrol && !is_null( $rcid ) && $rcid != 0 && $wgUser->isAllowed( 'patrol' ) ) {
$wgOut->addHTML(
"" .
wfMsg ( 'markaspatrolledlink',
@@ -968,29 +1002,22 @@ class Article {
$wgOut->setArticleBodyOnly(true);
$this->view();
}
-
- function purge() {
- global $wgUser, $wgRequest, $wgOut, $wgUseSquid;
-
- if ( $wgUser->isLoggedIn() || $wgRequest->wasPosted() || ! wfRunHooks( 'ArticlePurge', array( &$this ) ) ) {
- // Invalidate the cache
- $this->mTitle->invalidateCache();
- if ( $wgUseSquid ) {
- // Commit the transaction before the purge is sent
- $dbw = wfGetDB( DB_MASTER );
- $dbw->immediateCommit();
+ /**
+ * Handle action=purge
+ */
+ function purge() {
+ global $wgUser, $wgRequest, $wgOut;
- // Send purge
- $update = SquidUpdate::newSimplePurge( $this->mTitle );
- $update->doUpdate();
+ if ( $wgUser->isLoggedIn() || $wgRequest->wasPosted() ) {
+ if( wfRunHooks( 'ArticlePurge', array( &$this ) ) ) {
+ $this->doPurge();
}
- $this->view();
} else {
$msg = $wgOut->parse( wfMsg( 'confirm_purge' ) );
$action = $this->mTitle->escapeLocalURL( 'action=purge' );
$button = htmlspecialchars( wfMsg( 'confirm_purge_button' ) );
- $msg = str_replace( '$1',
+ $msg = str_replace( '$1',
"\n", $msg );
@@ -1000,6 +1027,26 @@ class Article {
$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.
@@ -1043,12 +1090,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
*/
@@ -1113,14 +1160,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, $wgUseSquid;
+ global $wgUser;
$fname = 'Article::insertNewArticle';
wfProfileIn( $fname );
@@ -1131,9 +1175,6 @@ class Article {
wfProfileOut( $fname );
return false;
}
-
- $this->mGoodAdjustment = $this->isCountable( $text );
- $this->mTotalAdjustment = 1;
$ns = $this->mTitle->getNamespace();
$ttl = $this->mTitle->getDBkey();
@@ -1144,6 +1185,13 @@ class Article {
}
$text = $this->preSaveTransform( $text );
+
+ # Set statistics members
+ # We work out if it's countable after PST to avoid counter drift
+ # when articles are created with {{subst:}}
+ $this->mGoodAdjustment = (int)$this->isCountable( $text );
+ $this->mTotalAdjustment = 1;
+
/* Silently ignore minoredit if not allowed */
$isminor = $isminor && $wgUser->isAllowed('minoredit');
$now = wfTimestampNow();
@@ -1169,15 +1217,20 @@ class Article {
Article::onArticleCreate( $this->mTitle );
if(!$suppressRC) {
- RecentChange::notifyNew( $now, $this->mTitle, $isminor, $wgUser, $summary, 'default',
+ require_once( 'RecentChange.php' );
+ $rcid = RecentChange::notifyNew( $now, $this->mTitle, $isminor, $wgUser, $summary, 'default',
'', strlen( $text ), $revisionId );
+ # Mark as patrolled if the user can and has the option set
+ if( $wgUser->isAllowed( 'patrol' ) && $wgUser->getOption( 'autopatrol' ) ) {
+ RecentChange::markPatrolled( $rcid );
+ }
}
if ($watchthis) {
- if(!$this->mTitle->userIsWatching()) $this->watch();
+ if(!$this->mTitle->userIsWatching()) $this->doWatch();
} else {
if ( $this->mTitle->userIsWatching() ) {
- $this->unwatch();
+ $this->doUnwatch();
}
}
@@ -1246,7 +1299,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
@@ -1258,7 +1311,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
@@ -1273,7 +1326,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);
@@ -1310,7 +1363,7 @@ class Article {
* first set $wgUser, and clean up $wgDeferredUpdates after each edit.
*/
function updateArticle( $text, $summary, $minor, $watchthis, $forceBot = false, $sectionanchor = '' ) {
- global $wgOut, $wgUser, $wgDBtransactions, $wgMwRedir, $wgUseSquid;
+ global $wgUser, $wgDBtransactions, $wgUseSquid;
global $wgPostCommitUpdateList, $wgUseFileCache;
$fname = 'Article::updateArticle';
@@ -1326,11 +1379,7 @@ class Article {
}
$isminor = $minor && $wgUser->isAllowed('minoredit');
- if ( $this->isRedirect( $text ) ) {
- $redir = 1;
- } else {
- $redir = 0;
- }
+ $redir = (int)$this->isRedirect( $text );
$text = $this->preSaveTransform( $text );
$dbw =& wfGetDB( DB_MASTER );
@@ -1345,15 +1394,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();
@@ -1366,7 +1415,7 @@ class Article {
'minor_edit' => $isminor,
'text' => $text
) );
-
+
$dbw->immediateCommit();
$dbw->begin();
$revisionId = $revision->insertOn( $dbw );
@@ -1380,12 +1429,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,
+ $rcid = RecentChange::notifyEdit( $now, $this->mTitle, $isminor, $wgUser, $summary,
$lastRevision, $this->getTimestamp(), $bot, '', $oldsize, $newsize,
$revisionId );
+
+ # Mark as patrolled if the user can do so and has it set in their options
+ if( $wgUser->isAllowed( 'patrol' ) && $wgUser->getOption( 'autopatrol' ) ) {
+ RecentChange::markPatrolled( $rcid );
+ }
+
$dbw->commit();
-
+
// Update caches outside the main transaction
Article::onArticleEdit( $this->mTitle );
}
@@ -1403,14 +1459,14 @@ 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();
}
}
@@ -1420,7 +1476,7 @@ class Article {
$urls = array();
# Invalidate caches of all articles using this article as a template
-
+
# Template namespace
# Purge all articles linking here
$titles = $this->mTitle->getTemplateLinksTo();
@@ -1459,19 +1515,18 @@ class Article {
* the link tables and redirect to the new page.
*/
function showArticle( $text, $subtitle , $sectionanchor = '', $me2, $now, $summary, $oldid ) {
- global $wgOut, $wgUser;
- global $wgUseEnotif;
+ global $wgOut;
$fname = 'Article::showArticle';
wfProfileIn( $fname );
-
+
# Output the redirect
if( $this->isRedirect( $text ) )
$r = 'redirect=no';
else
$r = '';
$wgOut->redirect( $this->mTitle->getFullURL( $r ).$sectionanchor );
-
+
wfProfileOut( $fname );
}
@@ -1479,44 +1534,40 @@ class Article {
* Mark this particular edit as patrolled
*/
function markpatrolled() {
- global $wgOut, $wgRequest, $wgOnlySysopsCanPatrol, $wgUseRCPatrol, $wgUser;
+ global $wgOut, $wgRequest, $wgUseRCPatrol, $wgUser;
$wgOut->setRobotpolicy( 'noindex,follow' );
- if ( !$wgUseRCPatrol )
- {
- $wgOut->errorpage( 'rcpatroldisabled', 'rcpatroldisabledtext' );
- return;
- }
- if ( $wgUser->isAnon() )
- {
- $wgOut->loginToUse();
+ # Check RC patrol config. option
+ if( !$wgUseRCPatrol ) {
+ $wgOut->errorPage( 'rcpatroldisabled', 'rcpatroldisabledtext' );
return;
}
- if ( $wgOnlySysopsCanPatrol && !$wgUser->isAllowed('patrol') )
- {
- $wgOut->sysopRequired();
+
+ # Check permissions
+ if( !$wgUser->isAllowed( 'patrol' ) ) {
+ $wgOut->permissionRequired( 'patrol' );
return;
}
+
$rcid = $wgRequest->getVal( 'rcid' );
- if ( !is_null ( $rcid ) )
- {
- if( wfRunHooks( 'MarkPatrolled', array( &$rcid, &$wgUser, $wgOnlySysopsCanPatrol ) ) ) {
+ if ( !is_null ( $rcid ) ) {
+ if( wfRunHooks( 'MarkPatrolled', array( &$rcid, &$wgUser, false ) ) ) {
+ require_once( 'RecentChange.php' );
RecentChange::markPatrolled( $rcid );
- wfRunHooks( 'MarkPatrolledComplete', array( &$rcid, &$wgUser, $wgOnlySysopsCanPatrol ) );
+ wfRunHooks( 'MarkPatrolledComplete', array( &$rcid, &$wgUser, false ) );
$wgOut->setPagetitle( wfMsg( 'markedaspatrolled' ) );
$wgOut->addWikiText( wfMsg( 'markedaspatrolledtext' ) );
}
$rcTitle = Title::makeTitle( NS_SPECIAL, 'Recentchanges' );
$wgOut->returnToMain( false, $rcTitle->getPrefixedText() );
}
- else
- {
+ else {
$wgOut->errorpage( 'markedaspatrollederror', 'markedaspatrollederrortext' );
}
}
/**
- * Add this page to $wgUser's watchlist
+ * User-interface handler for the "watch" action
*/
function watch() {
@@ -1531,14 +1582,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' );
@@ -1549,11 +1594,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;
@@ -1566,14 +1630,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' );
@@ -1584,6 +1642,26 @@ 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;
+ }
/**
* action=protect handler
@@ -1593,14 +1671,14 @@ class Article {
$form = new ProtectionForm( $this );
$form->show();
}
-
+
/**
* action=unprotect handler (alias)
*/
function unprotect() {
$this->protect();
}
-
+
/**
* Update the article's restriction field, and leave a log entry.
*
@@ -1609,50 +1687,66 @@ class Article {
* @return bool true on success
*/
function updateRestrictions( $limit = array(), $reason = '' ) {
- global $wgUser, $wgOut, $wgRequest;
-
- if ( !$wgUser->isAllowed( 'protect' ) ) {
- return false;
- }
-
- if( wfReadOnly() ) {
- return false;
- }
-
+ global $wgUser, $wgRestrictionTypes, $wgContLang;
+
$id = $this->mTitle->getArticleID();
- if ( 0 == $id ) {
+ if( !$wgUser->isAllowed( 'protect' ) || wfReadOnly() || $id == 0 ) {
return false;
}
- $flat = Article::flattenRestrictions( $limit );
- $protecting = ($flat != '');
-
- if( wfRunHooks( 'ArticleProtect', array( &$this, &$wgUser,
- $limit, $reason ) ) ) {
-
- $dbw =& wfGetDB( DB_MASTER );
- $dbw->update( 'page',
- array( /* SET */
- 'page_touched' => $dbw->timestamp(),
- 'page_restrictions' => $flat
- ), array( /* WHERE */
- 'page_id' => $id
- ), 'Article::protect'
- );
+ # FIXME: Same limitations as described in ProtectionForm.php (line 37);
+ # we expect a single selection, but the schema allows otherwise.
+ $current = array();
+ foreach( $wgRestrictionTypes as $action )
+ $current[$action] = implode( '', $this->mTitle->getRestrictions( $action ) );
- wfRunHooks( 'ArticleProtectComplete', array( &$this, &$wgUser,
- $limit, $reason ) );
+ $current = Article::flattenRestrictions( $current );
+ $updated = Article::flattenRestrictions( $limit );
+
+ $changed = ( $current != $updated );
+ $protect = ( $updated != '' );
+
+ # If nothing's changed, do nothing
+ if( $changed ) {
+ if( wfRunHooks( 'ArticleProtect', array( &$this, &$wgUser, $limit, $reason ) ) ) {
- $log = new LogPage( 'protect' );
- if( $protecting ) {
- $log->addEntry( 'protect', $this->mTitle, trim( $reason . " [$flat]" ) );
- } else {
- $log->addEntry( 'unprotect', $this->mTitle, $reason );
- }
- }
+ $dbw =& wfGetDB( DB_MASTER );
+
+ # Prepare a null revision to be added to the history
+ $comment = $wgContLang->ucfirst( wfMsgForContent( $protect ? 'protectedarticle' : 'unprotectedarticle', $this->mTitle->getPrefixedText() ) );
+ if( $reason )
+ $comment .= ": $reason";
+ if( $protect )
+ $comment .= " [$updated]";
+ $nullRevision = Revision::newNullRevision( $dbw, $id, $comment, true );
+ $nullRevId = $nullRevision->insertOn( $dbw );
+
+ # Update page record
+ $dbw->update( 'page',
+ array( /* SET */
+ 'page_touched' => $dbw->timestamp(),
+ 'page_restrictions' => $updated,
+ 'page_latest' => $nullRevId
+ ), array( /* WHERE */
+ 'page_id' => $id
+ ), 'Article::protect'
+ );
+ wfRunHooks( 'ArticleProtectComplete', array( &$this, &$wgUser, $limit, $reason ) );
+
+ # Update the protection log
+ $log = new LogPage( 'protect' );
+ if( $protect ) {
+ $log->addEntry( 'protect', $this->mTitle, trim( $reason . " [$updated]" ) );
+ } else {
+ $log->addEntry( 'unprotect', $this->mTitle, $reason );
+ }
+
+ } # End hook
+ } # End "changed" check
+
return true;
}
-
+
/**
* Take an array of page restrictions and flatten it to a string
* suitable for insertion into the page_restrictions field.
@@ -1665,6 +1759,7 @@ class Article {
wfDebugDieBacktrace( 'Article::flattenRestrictions given non-array restriction set' );
}
$bits = array();
+ ksort( $limit );
foreach( $limit as $action => $restrictions ) {
if( $restrictions != '' ) {
$bits[] = "$action=$restrictions";
@@ -1692,18 +1787,22 @@ class Article {
return;
}
} else {
- $wgOut->sysopRequired();
+ $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;
}
@@ -1715,38 +1814,29 @@ 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() .'');
+ $wgOut->addHTML( '' . wfMsg( 'historywarning' ) . ' ' . $skin->historyLink() . '' );
}
- # Fetch article 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
@@ -1780,10 +1870,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 );
@@ -1794,6 +1884,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
*/
@@ -1842,7 +1979,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" );
@@ -1871,7 +2008,7 @@ class Article {
* Returns success
*/
function doDeleteArticle( $reason ) {
- global $wgUser, $wgUseSquid, $wgDeferredUpdateList;
+ global $wgUseSquid, $wgDeferredUpdateList;
global $wgPostCommitUpdateList, $wgUseTrackbacks;
$fname = 'Article::doDeleteArticle';
@@ -1886,7 +2023,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();
@@ -1953,6 +2090,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' );
@@ -1977,12 +2116,12 @@ class Article {
return;
}
} else {
- $wgOut->sysopRequired();
+ $wgOut->permissionRequired( 'rollback' );
return;
}
if ( wfReadOnly() ) {
- $wgOut->readOnlyPage( $this->getContent( true ) );
+ $wgOut->readOnlyPage( $this->getContent() );
return;
}
if( !$wgUser->matchEditToken( $wgRequest->getVal( 'token' ),
@@ -2087,7 +2226,7 @@ class Article {
/**
* Do standard deferred updates after page view
- * @private
+ * @access private
*/
function viewUpdates() {
global $wgDeferredUpdateList;
@@ -2109,7 +2248,7 @@ class Article {
/**
* 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, $newid) {
@@ -2117,9 +2256,10 @@ class Article {
$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
@@ -2135,7 +2275,7 @@ class Article {
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' );
@@ -2161,14 +2301,16 @@ class Article {
# If this is another user's talk page, update newtalk
if ($this->mTitle->getNamespace() == NS_USER_TALK && $shortTitle != $wgUser->getName()) {
- $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 (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 );
+ }
}
}
@@ -2180,8 +2322,12 @@ class Article {
}
/**
- * @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 ) {
@@ -2193,7 +2339,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 );
@@ -2230,7 +2379,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;
@@ -2272,11 +2420,7 @@ class Article {
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;
}
@@ -2287,15 +2431,21 @@ class Article {
function getTouched() {
# Ensure that page data has been loaded
if( !$this->mDataLoaded ) {
- $dbr =& $this->getDB();
- $data = $this->pageDataFromId( $dbr, $this->getId() );
- if( $data ) {
- $this->loadPageData( $data );
- }
+ $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
@@ -2410,9 +2560,9 @@ class Article {
function onArticleDelete( $title ) {
global $wgMessageCache;
-
+
$title->touchLinks();
-
+
if( $title->getNamespace() == NS_MEDIAWIKI) {
$wgMessageCache->replace( $title->getDBkey(), false );
}
@@ -2423,9 +2573,9 @@ class Article {
*/
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) {
@@ -2483,7 +2633,7 @@ class Article {
$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() );
@@ -2525,7 +2675,7 @@ class Article {
return false;
}
- $dbr =& $this->getDB( DB_SLAVE );
+ $dbr =& wfGetDB( DB_SLAVE );
$rev_clause = array( 'rev_page' => $id );
$fname = 'Article::pageCountInfo';
@@ -2556,6 +2706,9 @@ class Article {
function getUsedTemplates() {
$result = array();
$id = $this->mTitle->getArticleID();
+ if( $id == 0 ) {
+ return array();
+ }
$dbr =& wfGetDB( DB_SLAVE );
$res = $dbr->select( array( 'templatelinks' ),