<?php
/**
* File for articles
- * @version $Id$
* @package MediaWiki
*/
/**
* Need the CacheManager to be loaded
*/
-require_once ( 'CacheManager.php' );
+require_once( 'CacheManager.php' );
+require_once( 'Revision.php' );
$wgArticleCurContentFields = false;
$wgArticleOldContentFields = false;
/**
- * Class representing a Wikipedia article and history.
+ * Class representing a MediaWiki article and history.
*
- * See design.doc for an overview.
+ * See design.txt for an overview.
* Note: edit user interface and cache support functions have been
* moved to separate EditPage and CacheManager classes.
*
- * @version $Id$
* @package MediaWiki
*/
class Article {
var $mTouched, $mFileCache, $mTitle;
var $mId, $mTable;
var $mForUpdate;
+ var $mOldId;
+ var $mRevIdFetched;
/**#@-*/
/**
$this->clear();
}
+ /**
+ * get the title object of the article
+ * @public
+ */
+ function getTitle() {
+ return $this->mTitle;
+ }
+
/**
* Clear the object
* @private
*/
function clear() {
+ $this->mDataLoaded = false;
$this->mContentLoaded = false;
+
$this->mCurID = $this->mUser = $this->mCounter = -1; # Not loaded
$this->mRedirectedFrom = $this->mUserText =
$this->mTimestamp = $this->mComment = $this->mFileCache = '';
$this->mCountAdjustment = 0;
$this->mTouched = '19700101000000';
$this->mForUpdate = false;
- }
-
- /**
- * Get revision text associated with an old or archive row
- * $row is usually an object from wfFetchRow(), both the flags and the text
- * field must be included
- * @static
- * @param integer $row Id of a row
- * @param string $prefix table prefix (default 'old_')
- * @return string $text|false the text requested
- */
- function getRevisionText( $row, $prefix = 'old_' ) {
- $fname = 'Article::getRevisionText';
- wfProfileIn( $fname );
-
- # Get data
- $textField = $prefix . 'text';
- $flagsField = $prefix . 'flags';
-
- if( isset( $row->$flagsField ) ) {
- $flags = explode( ',', $row->$flagsField );
- } else {
- $flags = array();
- }
-
- if( isset( $row->$textField ) ) {
- $text = $row->$textField;
- } else {
- return false;
- }
-
- if( in_array( 'gzip', $flags ) ) {
- # Deal with optional compression of archived pages.
- # This can be done periodically via maintenance/compressOld.php, and
- # as pages are saved if $wgCompressRevisions is set.
- $text = gzinflate( $text );
- }
-
- if( in_array( 'object', $flags ) ) {
- # Generic compressed storage
- $obj = unserialize( $text );
-
- # Bugger, corrupted my test database by double-serializing
- if ( !is_object( $obj ) ) {
- $obj = unserialize( $obj );
- }
-
- $text = $obj->getText();
- }
-
- global $wgLegacyEncoding;
- if( $wgLegacyEncoding && !in_array( 'utf-8', $flags ) ) {
- # Old revisions kept around in a legacy encoding?
- # Upconvert on demand.
- global $wgInputEncoding, $wgContLang;
- $text = $wgContLang->iconv( $wgLegacyEncoding, $wgInputEncoding, $text );
- }
- wfProfileOut( $fname );
- return $text;
- }
-
- /**
- * If $wgCompressRevisions is enabled, we will compress data.
- * The input string is modified in place.
- * Return value is the flags field: contains 'gzip' if the
- * data is compressed, and 'utf-8' if we're saving in UTF-8
- * mode.
- *
- * @static
- * @param mixed $text reference to a text
- * @return string
- */
- function compressRevisionText( &$text ) {
- global $wgCompressRevisions, $wgUseLatin1;
- $flags = array();
- if( !$wgUseLatin1 ) {
- # Revisions not marked this way will be converted
- # on load if $wgLegacyCharset is set in the future.
- $flags[] = 'utf-8';
- }
- if( $wgCompressRevisions ) {
- if( function_exists( 'gzdeflate' ) ) {
- $text = gzdeflate( $text );
- $flags[] = 'gzip';
- } else {
- wfDebug( "Article::compressRevisionText() -- no zlib support, not compressing\n" );
- }
- }
- return implode( ',', $flags );
+ $this->mIsRedirect = false;
+ $this->mRevIdFetched = 0;
}
/**
* @return Return the text of this revision
*/
function getContent( $noredir ) {
- global $wgRequest;
+ global $wgRequest, $wgUser;
# Get variables from query string :P
$action = $wgRequest->getText( 'action', 'view' );
$this->loadContent( $noredir );
# check if we're displaying a [[User talk:x.x.x.x]] anonymous talk page
if ( $this->mTitle->getNamespace() == NS_USER_TALK &&
- preg_match('/^\d{1,3}\.\d{1,3}.\d{1,3}\.\d{1,3}$/',$this->mTitle->getText()) &&
+ $wgUser->isIP($this->mTitle->getText()) &&
$action=='view'
) {
wfProfileOut( $fname );
/**
* Return an array of the columns of the "cur"-table
*/
- function &getCurContentFields() {
- global $wgArticleCurContentFields;
- if ( !$wgArticleCurContentFields ) {
- $wgArticleCurContentFields = array( 'cur_text','cur_timestamp','cur_user', 'cur_user_text',
- 'cur_comment','cur_counter','cur_restrictions','cur_touched' );
- }
- return $wgArticleCurContentFields;
- }
-
- /**
- * Return an array of the columns of the "old"-table
- */
- function &getOldContentFields() {
- global $wgArticleOldContentFields;
- if ( !$wgArticleOldContentFields ) {
- $wgArticleOldContentFields = array( 'old_namespace','old_title','old_text','old_timestamp',
- 'old_user','old_user_text','old_comment','old_flags' );
- }
- return $wgArticleOldContentFields;
+ 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() {
global $wgRequest, $wgOut;
static $lastid;
-
+
if ( isset( $lastid ) ) {
return $lastid;
}
-
+ # Query variables :P
$oldid = $wgRequest->getVal( 'oldid' );
if ( isset( $oldid ) ) {
- $dbr =& $this->getDB();
$oldid = IntVal( $oldid );
if ( $wgRequest->getVal( 'direction' ) == 'next' ) {
$nextid = $this->mTitle->getNextRevisionID( $oldid );
- if ( $nextid ) {
+ if ( $nextid ) {
$oldid = $nextid;
} else {
$wgOut->redirect( $this->mTitle->getFullURL( 'redirect=no' ) );
/**
* Load the revision (including cur_text) into this object
- */
+ */
function loadContent( $noredir = false ) {
global $wgOut, $wgRequest;
if ( $this->mContentLoaded ) return;
- $dbr =& $this->getDB();
# Query variables :P
$oldid = $this->getOldID();
$redirect = $wgRequest->getVal( 'redirect' );
$t = $this->mTitle->getPrefixedText();
- if ( isset( $oldid ) ) {
+ $noredir = $noredir || ($wgRequest->getVal( 'redirect' ) == 'no')
+ || $wgRequest->getCheck( 'rdfrom' );
+ $this->mOldId = $oldid;
+ $this->fetchContent( $oldid, $noredir, true );
+ }
+
+
+ /**
+ * Fetch a page record with the given conditions
+ * @param Database $dbr
+ * @param array $conditions
+ * @access private
+ */
+ function pageData( &$dbr, $conditions ) {
+ return $dbr->selectRow( 'page',
+ array(
+ 'page_id',
+ 'page_namespace',
+ 'page_title',
+ 'page_restrictions',
+ 'page_counter',
+ 'page_is_redirect',
+ 'page_is_new',
+ 'page_random',
+ 'page_touched',
+ 'page_latest',
+ 'page_len' ),
+ $conditions,
+ 'Article::pageData' );
+ }
+
+ function pageDataFromTitle( &$dbr, $title ) {
+ return $this->pageData( $dbr, array(
+ 'page_namespace' => $title->getNamespace(),
+ 'page_title' => $title->getDBkey() ) );
+ }
+
+ function pageDataFromId( &$dbr, $id ) {
+ return $this->pageData( $dbr, array(
+ 'page_id' => IntVal( $id ) ) );
+ }
+
+ /**
+ * Set the general counter, title etc data loaded from
+ * some source.
+ *
+ * @param object $data
+ * @access private
+ */
+ function loadPageData( $data ) {
+ $this->mTitle->mRestrictions = explode( ',', trim( $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;
+
+ $this->mDataLoaded = true;
+ }
+
+ /**
+ * Get text of an article from database
+ * @param int $oldid 0 for whatever the latest revision is
+ * @param bool $noredir Set to true to avoid following 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 = false, $globalTitle = false ) {
+ if ( $this->mContentLoaded ) {
+ return $this->mContent;
+ }
+ $dbr =& $this->getDB();
+ $fname = 'Article::fetchContent';
+
+ # Pre-fill content with error message so that if something
+ # fails we'll have something telling us what we intended.
+ $t = $this->mTitle->getPrefixedText();
+ if( $oldid ) {
$t .= ',oldid='.$oldid;
}
- if ( isset( $redirect ) ) {
+ if( isset( $redirect ) ) {
$redirect = ($redirect == 'no') ? 'no' : 'yes';
$t .= ',redirect='.$redirect;
}
$this->mContent = wfMsg( 'missingarticle', $t );
- if ( ! $oldid ) { # Retrieve current version
- $id = $this->getID();
- if ( 0 == $id ) return;
-
- $s = $dbr->selectRow( 'cur', $this->getCurContentFields(), array( 'cur_id' => $id ), $fname,
- $this->getSelectOptions() );
- if ( $s === false ) {
- return;
+ if( $oldid ) {
+ $revision = Revision::newFromId( $oldid );
+ if( is_null( $revision ) ) {
+ wfDebug( "$fname failed to retrieve specified revision, id $oldid\n" );
+ return false;
+ }
+ $data = $this->pageDataFromId( $dbr, $revision->getPage() );
+ if( !$data ) {
+ wfDebug( "$fname failed to get page data linked to revision id $oldid\n" );
+ return false;
+ }
+ $this->mTitle = Title::makeTitle( $data->page_namespace, $data->page_title );
+ $this->loadPageData( $data );
+ } else {
+ if( !$this->mDataLoaded ) {
+ $data = $this->pageDataFromTitle( $dbr, $this->mTitle );
+ if( !$data ) {
+ wfDebug( "$fname failed to find page data for title " . $this->mTitle->getPrefixedText() . "\n" );
+ return false;
+ }
+ $this->loadPageData( $data );
}
+ $revision = Revision::newFromId( $this->mLatest );
+ if( is_null( $revision ) ) {
+ 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 ( ( 'no' != $redirect ) && ( false == $noredir ) ) {
- $rt = Title::newFromRedirect( $s->cur_text );
- # 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.
-
- if ( $rt->getInterwiki() != '' ) {
- $wgOut->redirect( $rt->getFullURL() ) ;
- return;
+ # 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.
+ if( $globalTitle ) {
+ 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;
+ return false;
}
- $rid = $rt->getArticleID();
- if ( 0 != $rid ) {
- $redirRow = $dbr->selectRow( 'cur', $this->getCurContentFields(),
- array( 'cur_id' => $rid ), $fname, $this->getSelectOptions() );
-
- if ( $redirRow !== false ) {
- $this->mRedirectedFrom = $this->mTitle->getPrefixedText();
- $this->mTitle = $rt;
- $s = $redirRow;
- }
+ }
+ $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;
}
}
}
+ }
- $this->mContent = $s->cur_text;
- $this->mUser = $s->cur_user;
- $this->mUserText = $s->cur_user_text;
- $this->mComment = $s->cur_comment;
- $this->mCounter = $s->cur_counter;
- $this->mTimestamp = wfTimestamp(TS_MW,$s->cur_timestamp);
- $this->mTouched = wfTimestamp(TS_MW,$s->cur_touched);
- $this->mTitle->loadRestrictions( $s->cur_restrictions );
- } else { # oldid set, retrieve historical version
- $s = $dbr->selectRow( 'old', $this->getOldContentFields(), array( 'old_id' => $oldid ),
- $fname, $this->getSelectOptions() );
- if ( $s === false ) {
- return;
- }
-
- if( $this->mTitle->getNamespace() != $s->old_namespace ||
- $this->mTitle->getDBkey() != $s->old_title ) {
- $oldTitle = Title::makeTitle( $s->old_namesapce, $s->old_title );
- $this->mTitle = $oldTitle;
- $wgTitle = $oldTitle;
+ # if the title's different from expected, update...
+ if( $globalTitle ) {
+ global $wgTitle;
+ if( !$this->mTitle->equals( $wgTitle ) ) {
+ $wgTitle = $this->mTitle;
}
- $this->mContent = Article::getRevisionText( $s );
- $this->mUser = $s->old_user;
- $this->mUserText = $s->old_user_text;
- $this->mComment = $s->old_comment;
- $this->mCounter = 0;
- $this->mTimestamp = wfTimestamp(TS_MW,$s->old_timestamp);
}
+
+ # Back to the business at hand...
+ $this->mContent = $revision->getText();
+
+ $this->mUser = $revision->getUser();
+ $this->mUserText = $revision->getUserText();
+ $this->mComment = $revision->getComment();
+ $this->mTimestamp = wfTimestamp( TS_MW, $revision->getTimestamp() );
+
+ $this->mRevIdFetched = $revision->getID();
$this->mContentLoaded = true;
+
return $this->mContent;
}
* @param integer $oldid
*/
function getContentWithoutUsingSoManyDamnGlobals( $oldid = 0, $noredir = false ) {
- if ( $this->mContentLoaded ) {
- return $this->mContent;
- }
- $this->mContent = false;
-
- $fname = 'Article::getContentWithout';
- $dbr =& $this->getDB();
-
- if ( ! $oldid ) { # Retrieve current version
- $id = $this->getID();
- if ( 0 == $id ) {
- return false;
- }
-
- $s = $dbr->selectRow( 'cur', $this->getCurContentFields(), array( 'cur_id' => $id ),
- $fname, $this->getSelectOptions() );
- if ( $s === false ) {
- 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 ( !$noredir ) {
- $rt = Title::newFromRedirect( $s->cur_text );
- if( $rt && $rt->getInterwiki() == '' && $rt->getNamespace() != NS_SPECIAL ) {
- $rid = $rt->getArticleID();
- if ( 0 != $rid ) {
- $redirRow = $dbr->selectRow( 'cur', $this->getCurContentFields(),
- array( 'cur_id' => $rid ), $fname, $this->getSelectOptions() );
-
- if ( $redirRow !== false ) {
- $this->mRedirectedFrom = $this->mTitle->getPrefixedText();
- $this->mTitle = $rt;
- $s = $redirRow;
- }
- }
- }
- }
-
- $this->mContent = $s->cur_text;
- $this->mUser = $s->cur_user;
- $this->mUserText = $s->cur_user_text;
- $this->mComment = $s->cur_comment;
- $this->mCounter = $s->cur_counter;
- $this->mTimestamp = wfTimestamp(TS_MW,$s->cur_timestamp);
- $this->mTouched = wfTimestamp(TS_MW,$s->cur_touched);
- $this->mTitle->loadRestrictions( $s->cur_restrictions );
- } else { # oldid set, retrieve historical version
- $s = $dbr->selectRow( 'old', $this->getOldContentFields(), array( 'old_id' => $oldid ),
- $fname, $this->getSelectOptions() );
- if ( $s === false ) {
- return false;
- }
- $this->mContent = Article::getRevisionText( $s );
- $this->mUser = $s->old_user;
- $this->mUserText = $s->old_user_text;
- $this->mComment = $s->old_comment;
- $this->mCounter = 0;
- $this->mTimestamp = wfTimestamp(TS_MW,$s->old_timestamp);
- }
- $this->mContentLoaded = true;
- return $this->mContent;
+ return $this->fetchContent( $oldid, $noredir, false );
}
/**
* Get the database which should be used for reads
*/
function &getDB() {
- if ( $this->mForUpdate ) {
+ #if ( $this->mForUpdate ) {
return wfGetDB( DB_MASTER );
- } else {
- return wfGetDB( DB_SLAVE );
- }
+ #} else {
+ # return wfGetDB( DB_SLAVE );
+ #}
}
/**
*/
function getSelectOptions( $options = '' ) {
if ( $this->mForUpdate ) {
- if ( $options ) {
+ if ( is_array( $options ) ) {
$options[] = 'FOR UPDATE';
} else {
$options = 'FOR UPDATE';
if ( -1 == $this->mCounter ) {
$id = $this->getID();
$dbr =& $this->getDB();
- $this->mCounter = $dbr->selectField( 'cur', 'cur_counter', 'cur_id='.$id,
+ $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)?
+ * @param string $text Text to analyze
+ * @return integer 1 if it can be counted else 0
*/
function isCountable( $text ) {
global $wgUseCommaCount;
- if ( 0 != $this->mTitle->getNamespace() ) { return 0; }
+ if ( NS_MAIN != $this->mTitle->getNamespace() ) { return 0; }
if ( $this->isRedirect( $text ) ) { return 0; }
$token = ($wgUseCommaCount ? ',' : '[[' );
if ( false === strstr( $text, $token ) ) { return 0; }
function isRedirect( $text = false ) {
if ( $text === false ) {
$this->loadContent();
- $titleObj = Title::newFromRedirect( $this->mText );
+ $titleObj = Title::newFromRedirect( $this->fetchRevisionText() );
} else {
$titleObj = Title::newFromRedirect( $text );
}
}
/**
- * Loads everything from cur except cur_text
+ * Loads everything except the text
* This isn't necessary for all uses, so it's only done if needed.
* @private
*/
function loadLastEdit() {
global $wgOut;
- if ( -1 != $this->mUser ) return;
-
- $fname = 'Article::loadLastEdit';
+
+ if ( -1 != $this->mUser )
+ return;
- $dbr =& $this->getDB();
- $s = $dbr->selectRow( 'cur',
- array( 'cur_user','cur_user_text','cur_timestamp', 'cur_comment','cur_minor_edit' ),
- array( 'cur_id' => $this->getID() ), $fname, $this->getSelectOptions() );
+ # New or non-existent articles have no user information
+ $id = $this->getID();
+ if ( 0 == $id ) return;
- if ( $s !== false ) {
- $this->mUser = $s->cur_user;
- $this->mUserText = $s->cur_user_text;
- $this->mTimestamp = wfTimestamp(TS_MW,$s->cur_timestamp);
- $this->mComment = $s->cur_comment;
- $this->mMinorEdit = $s->cur_minor_edit;
+ $this->mLastRevision = Revision::loadFromPageId( $this->getDB(), $id );
+ if( !is_null( $this->mLastRevision ) ) {
+ $this->mUser = $this->mLastRevision->getUser();
+ $this->mUserText = $this->mLastRevision->getUserText();
+ $this->mTimestamp = $this->mLastRevision->getTimestamp();
+ $this->mComment = $this->mLastRevision->getComment();
+ $this->mMinorEdit = $this->mLastRevision->isMinor();
}
}
$this->loadLastEdit();
return $this->mMinorEdit;
}
+
+ function getRevIdFetched() {
+ $this->loadLastEdit();
+ return $this->mRevIdFetched;
+ }
function getContributors($limit = 0, $offset = 0) {
$fname = 'Article::getContributors';
$title = $this->mTitle;
$contribs = array();
$dbr =& $this->getDB();
- $oldTable = $dbr->tableName( 'old' );
+ $revTable = $dbr->tableName( 'revision' );
$userTable = $dbr->tableName( 'user' );
$encDBkey = $dbr->addQuotes( $title->getDBkey() );
$ns = $title->getNamespace();
$user = $this->getUser();
+ $pageId = $this->getId();
- $sql = "SELECT old_user, old_user_text, user_real_name, MAX(old_timestamp) as timestamp
- FROM $oldTable LEFT JOIN $userTable ON old_user = user_id
- WHERE old_namespace = $user
- AND old_title = $encDBkey
- AND old_user != $user
- GROUP BY old_user, old_user_text, user_real_name
+ $sql = "SELECT rev_user, rev_user_text, user_real_name, MAX(rev_timestamp) as timestamp
+ FROM $revTable LEFT JOIN $userTable ON rev_user = user_id
+ WHERE rev_page = $pageId
+ AND rev_user != $user
+ GROUP BY rev_user, rev_user_text, user_real_name
ORDER BY timestamp DESC";
if ($limit > 0) { $sql .= ' LIMIT '.$limit; }
$res = $dbr->query($sql, $fname);
while ( $line = $dbr->fetchObject( $res ) ) {
- $contribs[] = array($line->old_user, $line->old_user_text, $line->user_real_name);
+ $contribs[] = array($line->rev_user, $line->rev_user_text, $line->user_real_name);
}
$dbr->freeResult($res);
function view() {
global $wgUser, $wgOut, $wgRequest, $wgOnlySysopsCanPatrol, $wgLang;
global $wgLinkCache, $IP, $wgEnableParserCache, $wgStylePath, $wgUseRCPatrol;
+ global $wgEnotif, $wgParser;
$sk = $wgUser->getSkin();
$fname = 'Article::view';
$oldid = $this->getOldID();
$diff = $wgRequest->getVal( 'diff' );
$rcid = $wgRequest->getVal( 'rcid' );
+ $rdfrom = $wgRequest->getVal( 'rdfrom' );
$wgOut->setArticleFlag( true );
$wgOut->setRobotpolicy( 'index,follow' );
if ( !is_null( $diff ) ) {
require_once( 'DifferenceEngine.php' );
$wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
+
$de = new DifferenceEngine( $oldid, $diff, $rcid );
+ // DifferenceEngine directly fetched the revision:
+ $this->mRevIdFetched = $de->mNewid;
$de->showDiffPage();
+
if( $diff == 0 ) {
# Run view updates for current revision only
$this->viewUpdates();
}
}
# Should the parser cache be used?
- if ( $wgEnableParserCache && intval($wgUser->getOption( 'stubthreshold' )) == 0 && empty( $oldid ) ) {
+ if ( $wgEnableParserCache && intval($wgUser->getOption( 'stubthreshold' )) == 0 && empty( $oldid ) && $this->getID() ) {
$pcache = true;
} else {
$pcache = false;
# We're looking at an old revision
if ( !empty( $oldid ) ) {
- $this->setOldSubtitle( $oldid );
+ $this->setOldSubtitle( isset($this->mOldId) ? $this->mOldId : $oldid );
$wgOut->setRobotpolicy( 'noindex,follow' );
}
if ( '' != $this->mRedirectedFrom ) {
# 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 );
+ }
}
# wrap user css and user js in pre and don't parse
$wgOut->addHTML( '<img valign="center" src="'.$imageUrl.'" alt="#REDIRECT" />' .
'<span class="redirectText">'.$link.'</span>' );
-
+
+ $parseout = $wgParser->parse($text, $this->mTitle, ParserOptions::newFromUser($wgUser));
+ $catlinks = $parseout->getCategoryLinks();
+ $wgOut->addCategoryLinks($catlinks);
+ $skin = $wgUser->getSkin();
} else if ( $pcache ) {
# Display content and save to parser cache
$wgOut->addPrimaryWikiText( $text, $this );
$wgOut->addWikiText( $text );
}
}
- $wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
+ /* title may have been set from the cache */
+ $t = $wgOut->getPageTitle();
+ if( empty( $t ) ) {
+ $wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
+ }
+
# 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->getID() != 0 &&
+ if ( $wgUseRCPatrol && !is_null ( $rcid ) && $rcid != 0 && $wgUser->isLoggedIn() &&
( $wgUser->isAllowed('patrol') || !$wgOnlySysopsCanPatrol ) )
{
$wgOut->addHTML( wfMsg ( 'markaspatrolledlink',
wfProfileOut( $fname );
}
+ /**
+ * Insert a new empty page record for this article.
+ * This *must* be followed up by creating a revision
+ * and running $this->updateToLatest( $rev_id );
+ * or else the record will be left in a funky state.
+ * Best if all done inside a transaction.
+ *
+ * @param Database $dbw
+ * @param string $restrictions
+ * @return int The newly created page_id key
+ * @access private
+ */
+ function insertOn( &$dbw, $restrictions = '' ) {
+ $fname = 'Article::insertOn';
+ wfProfileIn( $fname );
+
+ $page_id = $dbw->nextSequenceValue( 'page_page_id_seq' );
+ $dbw->insert( 'page', array(
+ 'page_id' => $page_id,
+ 'page_namespace' => $this->mTitle->getNamespace(),
+ 'page_title' => $this->mTitle->getDBkey(),
+ 'page_counter' => 0,
+ 'page_restrictions' => $restrictions,
+ 'page_is_redirect' => 0, # Will set this shortly...
+ 'page_is_new' => 1,
+ 'page_random' => wfRandom(),
+ 'page_touched' => $dbw->timestamp(),
+ 'page_latest' => 0, # Fill this in shortly...
+ ), $fname );
+ $newid = $dbw->insertId();
+
+ $this->mTitle->resetArticleId( $newid );
+
+ wfProfileOut( $fname );
+ return $newid;
+ }
+
+ /**
+ * 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.
+ * @return bool true on success, false on failure
+ * @access private
+ */
+ function updateRevisionOn( &$dbw, $revision, $lastRevision = null ) {
+ $fname = 'Article::updateToRevision';
+ wfProfileIn( $fname );
+
+ $conditions = array( 'page_id' => $this->getId() );
+ if( !is_null( $lastRevision ) ) {
+ # An extra check against threads stepping on each other
+ $conditions['page_latest'] = $lastRevision;
+ }
+ $text = $revision->getText();
+ $dbw->update( 'page',
+ array( /* SET */
+ 'page_latest' => $revision->getId(),
+ 'page_touched' => $dbw->timestamp(),
+ 'page_is_new' => ($lastRevision === 0) ? 0 : 1,
+ 'page_is_redirect' => Article::isRedirect( $text ),
+ 'page_len' => strlen( $text ),
+ ),
+ $conditions,
+ $fname );
+
+ wfProfileOut( $fname );
+ return ( $dbw->affectedRows() != 0 );
+ }
+
+ /**
+ * If the given revision is newer than the currently set page_latest,
+ * update the page record. Otherwise, do nothing.
+ *
+ * @param Database $dbw
+ * @param Revision $revision
+ */
+ function updateIfNewerOn( &$dbw, $revision ) {
+ $fname = 'Article::updateIfNewerOn';
+ wfProfileIn( $fname );
+
+ $row = $dbw->selectRow(
+ array( 'revision', 'page' ),
+ array( 'rev_id', 'rev_timestamp' ),
+ array(
+ 'page_id' => $this->getId(),
+ 'page_latest=rev_id' ),
+ $fname );
+ if( $row ) {
+ if( $row->rev_timestamp >= $revision->getTimestamp() ) {
+ wfProfileOut( $fname );
+ return false;
+ }
+ $prev = $row->rev_id;
+ } else {
+ # No or missing previous revision; mark the page as new
+ $prev = 0;
+ }
+
+ $ret = $this->updateRevisionOn( $dbw, $revision, $prev );
+ wfProfileOut( $fname );
+ return $ret;
+ }
+
/**
* Theoretically we could defer these whole insert and update
* functions for after display, but that's taking a big leap
* errors at some point.
* @private
*/
- function insertNewArticle( $text, $summary, $isminor, $watchthis ) {
+ function insertNewArticle( $text, $summary, $isminor, $watchthis, $suppressRC=false ) {
global $wgOut, $wgUser;
global $wgUseSquid, $wgDeferredUpdateList, $wgInternalServer;
$ns = $this->mTitle->getNamespace();
$ttl = $this->mTitle->getDBkey();
$text = $this->preSaveTransform( $text );
- if ( $this->isRedirect( $text ) ) { $redir = 1; }
- else { $redir = 0; }
-
+ $isminor = ( $isminor && $wgUser->isLoggedIn() ) ? 1 : 0;
$now = wfTimestampNow();
- $won = wfInvertTimestamp( $now );
- wfSeedRandom();
- $rand = wfRandom();
+
$dbw =& wfGetDB( DB_MASTER );
- $cur_id = $dbw->nextSequenceValue( 'cur_cur_id_seq' );
-
- $isminor = ( $isminor && $wgUser->getID() ) ? 1 : 0;
-
- $dbw->insert( 'cur', array(
- 'cur_id' => $cur_id,
- 'cur_namespace' => $ns,
- 'cur_title' => $ttl,
- 'cur_text' => $text,
- 'cur_comment' => $summary,
- 'cur_user' => $wgUser->getID(),
- 'cur_timestamp' => $dbw->timestamp($now),
- 'cur_minor_edit' => $isminor,
- 'cur_counter' => 0,
- 'cur_restrictions' => '',
- 'cur_user_text' => $wgUser->getName(),
- 'cur_is_redirect' => $redir,
- 'cur_is_new' => 1,
- 'cur_random' => $rand,
- 'cur_touched' => $dbw->timestamp($now),
- 'inverse_timestamp' => $won,
- ), $fname );
+ # Add the page record; stake our claim on this title!
+ $newid = $this->insertOn( $dbw );
+
+ # Save the revision text...
+ $revision = new Revision( array(
+ 'page' => $newid,
+ 'comment' => $summary,
+ 'minor_edit' => $isminor,
+ 'text' => $text
+ ) );
+ $revisionId = $revision->insertOn( $dbw );
- $newid = $dbw->insertId();
$this->mTitle->resetArticleID( $newid );
+
+ # Update the page record with revision data
+ $this->updateRevisionOn( $dbw, $revision, 0 );
Article::onArticleCreate( $this->mTitle );
- RecentChange::notifyNew( $now, $this->mTitle, $isminor, $wgUser, $summary );
+ if(!$suppressRC) {
+ RecentChange::notifyNew( $now, $this->mTitle, $isminor, $wgUser, $summary );
+ }
if ($watchthis) {
if(!$this->mTitle->userIsWatching()) $this->watch();
# The talk page isn't in the regular link tables, so we need to update manually:
$talkns = $ns ^ 1; # talk -> normal; normal -> talk
- $dbw->update( 'cur', array('cur_touched' => $dbw->timestamp($now) ),
- array( 'cur_namespace' => $talkns, 'cur_title' => $ttl ), $fname );
+ $dbw->update( 'page',
+ array( 'page_touched' => $dbw->timestamp($now) ),
+ array( 'page_namespace' => $talkns,
+ 'page_title' => $ttl ),
+ $fname );
# standard deferred updates
- $this->editUpdates( $text );
+ $this->editUpdates( $text, $summary, $isminor, $now );
- $this->showArticle( $text, wfMsg( 'newarticle' ) );
+ $oldid = 0; # new article
+ $this->showArticle( $text, wfMsg( 'newarticle' ), false, $isminor, $now, $summary, $oldid );
}
-
/**
- * Side effects: loads last edit if $edittime is NULL
+ * Fetch and uncompress the text for a given revision.
+ * Can ask by rev_id number or timestamp (set $field)
+ * FIXME: This function is broken. Eliminate all uses and remove.
+ * Use Revision class in place.
*/
+ function fetchRevisionText( $revId = null, $field = 'rev_id' ) {
+ $fname = 'Article::fetchRevisionText';
+ $dbw =& wfGetDB( DB_MASTER );
+ if( $revId ) {
+ $rev = $dbw->addQuotes( $revId );
+ } else {
+ $rev = 'page_latest';
+ }
+ $result = $dbw->query(
+ sprintf( "SELECT old_text, old_flags
+ FROM %s,%s,%s
+ WHERE old_id=rev_id AND rev_page=page_id AND page_id=%d
+ AND %s=%s",
+ $dbw->tableName( 'page' ),
+ $dbw->tableName( 'revision' ),
+ $dbw->tableName( 'text' ),
+ IntVal( $this->mTitle->getArticleId() ),
+ $field,
+ $rev ),
+ $fname );
+ $obj = $dbw->fetchObject( $result );
+ $dbw->freeResult( $result );
+ $oldtext = Revision::getRevisionText( $obj );
+ return $oldtext;
+ }
+
function getTextOfLastEditWithSectionReplacedOrAdded($section, $text, $summary = '', $edittime = NULL) {
$fname = 'Article::getTextOfLastEditWithSectionReplacedOrAdded';
- if(is_null($edittime)) {
- $this->loadLastEdit();
- $oldtext = $this->getContent( true );
- } else {
- $dbw =& wfGetDB( DB_MASTER );
- $ns = $this->mTitle->getNamespace();
- $title = $this->mTitle->getDBkey();
- $obj = $dbw->selectRow( 'old',
- array( 'old_text','old_flags'),
- array( 'old_namespace' => $ns, 'old_title' => $title,
- 'old_timestamp' => $dbw->timestamp($edittime)),
- $fname );
- $oldtext = Article::getRevisionText( $obj );
- }
if ($section != '') {
+ if( is_null( $edittime ) ) {
+ $rev = Revision::newFromTitle( $this->mTitle );
+ } else {
+ $dbw =& wfGetDB( DB_MASTER );
+ $rev = Revision::loadFromTimestamp( $dbw, $this->mTitle, $edittime );
+ }
+ $oldtext = $rev->getText();
+
if($section=='new') {
if($summary) $subject="== {$summary} ==\n\n";
$text=$oldtext."\n\n".$subject.$text;
function updateArticle( $text, $summary, $minor, $watchthis, $forceBot = false, $sectionanchor = '' ) {
global $wgOut, $wgUser;
global $wgDBtransactions, $wgMwRedir;
- global $wgUseSquid, $wgInternalServer;
+ global $wgUseSquid, $wgInternalServer, $wgPostCommitUpdateList;
$fname = 'Article::updateArticle';
$good = true;
- if ( $this->mMinorEdit ) { $me1 = 1; } else { $me1 = 0; }
- if ( $minor && $wgUser->getID() ) { $me2 = 1; } else { $me2 = 0; }
+ $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
$text = $this->preSaveTransform( $text );
$dbw =& wfGetDB( DB_MASTER );
+ $now = wfTimestampNow();
# Update article, but only if changed.
# It's important that we either rollback or complete, otherwise an attacker could
# overwrite cur entries by sending precisely timed user aborts. Random bored users
# could conceivably have the same effect, especially if cur is locked for long periods.
- if( $wgDBtransactions ) {
- $dbw->query( 'BEGIN', $fname );
- } else {
+ if( !$wgDBtransactions ) {
$userAbort = ignore_user_abort( true );
}
$oldtext = $this->getContent( true );
+ $lastRevision = 0;
if ( 0 != strcmp( $text, $oldtext ) ) {
$this->mCountAdjustment = $this->isCountable( $text )
- $this->isCountable( $oldtext );
$now = wfTimestampNow();
- $won = wfInvertTimestamp( $now );
- # First update the cur row
- $dbw->update( 'cur',
- array( /* SET */
- 'cur_text' => $text,
- 'cur_comment' => $summary,
- 'cur_minor_edit' => $me2,
- 'cur_user' => $wgUser->getID(),
- 'cur_timestamp' => $dbw->timestamp($now),
- 'cur_user_text' => $wgUser->getName(),
- 'cur_is_redirect' => $redir,
- 'cur_is_new' => 0,
- 'cur_touched' => $dbw->timestamp($now),
- 'inverse_timestamp' => $won
- ), array( /* WHERE */
- 'cur_id' => $this->getID(),
- 'cur_timestamp' => $dbw->timestamp($this->getTimestamp())
- ), $fname
- );
+ $lastRevision = $dbw->selectField(
+ 'page', 'page_latest', array( 'page_id' => $this->getId() ) );
+
+ $revision = new Revision( array(
+ 'page' => $this->getId(),
+ 'comment' => $summary,
+ 'minor_edit' => $isminor,
+ 'text' => $text
+ ) );
+ $revisionId = $revision->insertOn( $dbw );
+
+ # Update page
+ $ok = $this->updateRevisionOn( $dbw, $revision, $lastRevision );
- if( $dbw->affectedRows() == 0 ) {
+ if( !$ok ) {
/* Belated edit conflict! Run away!! */
$good = false;
} else {
- # Now insert the previous revision into old
-
- # This overwrites $oldtext if revision compression is on
- $flags = Article::compressRevisionText( $oldtext );
-
- $dbw->insert( 'old',
- array(
- 'old_id' => $dbw->nextSequenceValue( 'old_old_id_seq' ),
- 'old_namespace' => $this->mTitle->getNamespace(),
- 'old_title' => $this->mTitle->getDBkey(),
- 'old_text' => $oldtext,
- 'old_comment' => $this->getComment(),
- 'old_user' => $this->getUser(),
- 'old_user_text' => $this->getUserText(),
- 'old_timestamp' => $dbw->timestamp($this->getTimestamp()),
- 'old_minor_edit' => $me1,
- 'inverse_timestamp' => wfInvertTimestamp( $this->getTimestamp() ),
- 'old_flags' => $flags,
- ), $fname
- );
-
- $oldid = $dbw->insertId();
-
+ # Update recentchanges and purge cache and whatnot
$bot = (int)($wgUser->isBot() || $forceBot);
- RecentChange::notifyEdit( $now, $this->mTitle, $me2, $wgUser, $summary,
- $oldid, $this->getTimestamp(), $bot );
+ RecentChange::notifyEdit( $now, $this->mTitle, $isminor, $wgUser, $summary,
+ $lastRevision, $this->getTimestamp(), $bot );
Article::onArticleEdit( $this->mTitle );
}
}
- if( $wgDBtransactions ) {
- $dbw->query( 'COMMIT', $fname );
- } else {
+ if( !$wgDBtransactions ) {
ignore_user_abort( $userAbort );
}
if ( $good ) {
- if ($watchthis) {
- if (!$this->mTitle->userIsWatching()) $this->watch();
- } else {
- if ( $this->mTitle->userIsWatching() ) {
- $this->unwatch();
+ if ($watchthis) {
+ if (!$this->mTitle->userIsWatching()) $this->watch();
+ } else {
+ if ( $this->mTitle->userIsWatching() ) {
+ $this->unwatch();
+ }
}
- }
- # standard deferred updates
- $this->editUpdates( $text );
-
-
- $urls = array();
- # Template namespace
- # Purge all articles linking here
- if ( $this->mTitle->getNamespace() == NS_TEMPLATE) {
- $titles = $this->mTitle->getLinksTo();
- Title::touchArray( $titles );
+ # standard deferred updates
+ $this->editUpdates( $text, $summary, $minor, $now );
+
+
+ $urls = array();
+ # 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();
+ }
+ }
+ }
+
+ # Squid updates
if ( $wgUseSquid ) {
- foreach ( $titles as $title ) {
- $urls[] = $title->getInternalURL();
- }
+ $urls = array_merge( $urls, $this->mTitle->getSquidURLs() );
+ $u = new SquidUpdate( $urls );
+ array_push( $wgPostCommitUpdateList, $u );
}
- }
-
- # Squid updates
- if ( $wgUseSquid ) {
- $urls = array_merge( $urls, $this->mTitle->getSquidURLs() );
- $u = new SquidUpdate( $urls );
- $u->doUpdate();
- }
-
- $this->showArticle( $text, wfMsg( 'updated' ), $sectionanchor );
+
+ $this->showArticle( $text, wfMsg( 'updated' ), $sectionanchor, $isminor, $now, $summary, $lastRevision );
}
return $good;
}
* After we've either updated or inserted the article, update
* the link tables and redirect to the new page.
*/
- function showArticle( $text, $subtitle , $sectionanchor = '' ) {
- global $wgOut, $wgUser, $wgLinkCache;
+ function showArticle( $text, $subtitle , $sectionanchor = '', $me2, $now, $summary, $oldid ) {
+ global $wgOut, $wgUser, $wgLinkCache, $wgEnotif;
$wgLinkCache = new LinkCache();
# Select for update
else
$r = '';
$wgOut->redirect( $this->mTitle->getFullURL( $r ).$sectionanchor );
- }
- /**
- * Validate article
- * @todo document this function a bit more
- */
- function validate () {
- global $wgOut, $wgUseValidation;
- if( $wgUseValidation ) {
- require_once ( 'SpecialValidate.php' ) ;
- $wgOut->setPagetitle( wfMsg( 'validate' ) . ': ' . $this->mTitle->getPrefixedText() );
- $wgOut->setRobotpolicy( 'noindex,follow' );
- if( $this->mTitle->getNamespace() != 0 ) {
- $wgOut->addHTML( wfMsg( 'val_validate_article_namespace_only' ) );
- return;
- }
- $v = new Validation;
- $v->validate_form( $this->mTitle->getDBkey() );
- } else {
- $wgOut->errorpage( 'nosuchaction', 'nosuchactiontext' );
- }
+ # this call would better fit into RecentChange::notifyEdit and RecentChange::notifyNew .
+ # this will be improved later (to-do)
+
+ include_once( "UserMailer.php" );
+ $wgEnotif = new EmailNotification ();
+ $wgEnotif->NotifyOnPageChange( $wgUser->getID(), $this->mTitle->getDBkey(), $this->mTitle->getNamespace(),$now, $summary, $me2, $oldid );
}
/**
$wgOut->errorpage( 'rcpatroldisabled', 'rcpatroldisabledtext' );
return;
}
- if ( $wgUser->getID() == 0 )
+ if ( $wgUser->isAnon() )
{
$wgOut->loginToUse();
return;
RecentChange::markPatrolled( $rcid );
$wgOut->setPagetitle( wfMsg( 'markedaspatrolled' ) );
$wgOut->addWikiText( wfMsg( 'markedaspatrolledtext' ) );
- $wgOut->returnToMain( true, $this->mTitle->getPrefixedText() );
+
+ $rcTitle = Title::makeTitle( NS_SPECIAL, 'Recentchanges' );
+ $wgOut->returnToMain( false, $rcTitle->getPrefixedText() );
}
else
{
}
}
+ /**
+ * 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
+ $t = $v->validatePageForm ( $this , $revision ) ;
+
+ $wgOut->addHTML ( $t ) ;
+ }
/**
- * Add or remove this page to my watchlist based on value of $add
+ * Add this page to $wgUser's watchlist
*/
- function watch( $add = true ) {
+
+ function watch() {
+
global $wgUser, $wgOut;
- if ( 0 == $wgUser->getID() ) {
+ if ( $wgUser->isAnon() ) {
$wgOut->errorpage( 'watchnologin', 'watchnologintext' );
return;
}
$wgOut->readOnlyPage();
return;
}
- if( $add )
- $wgUser->addWatch( $this->mTitle );
- else
- $wgUser->removeWatch( $this->mTitle );
- $wgOut->setPagetitle( wfMsg( $add ? 'addedwatch' : 'removedwatch' ) );
- $wgOut->setRobotpolicy( 'noindex,follow' );
+ if (wfRunHooks('WatchArticle', array(&$wgUser, &$this))) {
+
+ $wgUser->addWatch( $this->mTitle );
+ $wgUser->saveSettings();
- $sk = $wgUser->getSkin() ;
- $link = $this->mTitle->getPrefixedText();
+ wfRunHooks('WatchArticleComplete', array(&$wgUser, &$this));
- if($add)
+ $wgOut->setPagetitle( wfMsg( 'addedwatch' ) );
+ $wgOut->setRobotpolicy( 'noindex,follow' );
+
+ $link = $this->mTitle->getPrefixedText();
$text = wfMsg( 'addedwatchtext', $link );
- else
- $text = wfMsg( 'removedwatchtext', $link );
- $wgOut->addWikiText( $text );
-
- $wgUser->saveSettings();
+ $wgOut->addWikiText( $text );
+ }
$wgOut->returnToMain( true, $this->mTitle->getPrefixedText() );
}
/**
- * Stop watching a page, it act just like a call to watch(false)
+ * Stop watching a page
*/
+
function unwatch() {
- $this->watch( false );
+
+ global $wgUser, $wgOut;
+
+ if ( $wgUser->isAnon() ) {
+ $wgOut->errorpage( 'watchnologin', 'watchnologintext' );
+ return;
+ }
+ if ( wfReadOnly() ) {
+ $wgOut->readOnlyPage();
+ return;
+ }
+
+ if (wfRunHooks('UnwatchArticle', array(&$wgUser, &$this))) {
+
+ $wgUser->removeWatch( $this->mTitle );
+ $wgUser->saveSettings();
+
+ wfRunHooks('UnwatchArticleComplete', array(&$wgUser, &$this));
+
+ $wgOut->setPagetitle( wfMsg( 'removedwatch' ) );
+ $wgOut->setRobotpolicy( 'noindex,follow' );
+
+ $link = $this->mTitle->getPrefixedText();
+ $text = wfMsg( 'removedwatchtext', $link );
+ $wgOut->addWikiText( $text );
+ }
+
+ $wgOut->returnToMain( true, $this->mTitle->getPrefixedText() );
}
/**
return;
}
- $confirm = $wgRequest->getBool( 'wpConfirmProtect' ) && $wgRequest->wasPosted();
+ $confirm = $wgRequest->wasPosted() &&
+ $wgUser->matchEditToken( $wgRequest->getVal( 'wpEditToken' ) );
$moveonly = $wgRequest->getBool( 'wpMoveOnly' );
$reason = $wgRequest->getText( 'wpReasonProtect' );
if ( $confirm ) {
+ $dbw =& wfGetDB( DB_MASTER );
+ $dbw->update( 'page',
+ array( /* SET */
+ 'page_touched' => $dbw->timestamp(),
+ 'page_restrictions' => (string)$limit
+ ), array( /* WHERE */
+ 'page_id' => $id
+ ), 'Article::protect'
+ );
$restrictions = "move=" . $limit;
if( !$moveonly ) {
$restrictions .= ":edit=" . $limit;
}
- if (wfRunHooks('ArticleProtect', $this, $wgUser, $limit == 'sysop', $reason, $moveonly)) {
+ if (wfRunHooks('ArticleProtect', array(&$this, &$wgUser, $limit == 'sysop', $reason, $moveonly))) {
$dbw =& wfGetDB( DB_MASTER );
- $dbw->update( 'cur',
+ $dbw->update( 'page',
array( /* SET */
- 'cur_touched' => $dbw->timestamp(),
- 'cur_restrictions' => $restrictions
+ 'page_touched' => $dbw->timestamp(),
+ 'page_restrictions' => $restrictions
), array( /* WHERE */
- 'cur_id' => $id
+ 'page_id' => $id
), 'Article::protect'
);
- wfRunHooks('ArticleProtectComplete', $this, $wgUser, $limit == 'sysop', $reason, $moveonly);
+ wfRunHooks('ArticleProtectComplete', array(&$this, &$wgUser, $limit == 'sysop', $reason, $moveonly));
$log = new LogPage( 'protect' );
if ( $limit === '' ) {
* Output protection confirmation dialog
*/
function confirmProtect( $par, $reason, $limit = 'sysop' ) {
- global $wgOut;
+ global $wgOut, $wgUser;
wfDebug( "Article::confirmProtect\n" );
$wgOut->setPageTitle( wfMsg( 'confirmunprotect' ) );
$wgOut->setSubtitle( wfMsg( 'unprotectsub', $sub ) );
$wgOut->addWikiText( wfMsg( 'confirmunprotecttext' ) );
- $check = htmlspecialchars( wfMsg( 'confirmunprotect' ) );
$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' ) );
- $check = htmlspecialchars( wfMsg( 'confirmprotect' ) );
$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( "
<form id='protectconfirm' method='post' action=\"{$formaction}\">
<td align='left'>
<input type='text' size='60' name='wpReasonProtect' id='wpReasonProtect' value=\"" . htmlspecialchars( $reason ) . "\" />
</td>
- </tr>
- <tr>
- <td> </td>
- </tr>
- <tr>
- <td align='right'>
- <input type='checkbox' name='wpConfirmProtect' value='1' id='wpConfirmProtect' />
- </td>
- <td>
- <label for='wpConfirmProtect'>{$check}</label>
- </td>
- </tr> " );
+ </tr>" );
if($moveonly != '') {
$wgOut->AddHTML( "
<tr>
<td align='right'>
<input type='checkbox' name='wpMoveOnly' value='1' id='wpMoveOnly' />
</td>
- <td>
+ <td align='left'>
<label for='wpMoveOnly'>{$moveonly}</label>
</td>
</tr> " );
</td>
</tr>
</table>
-</form>\n" );
+ <input type='hidden' name='wpEditToken' value=\"{$token}\" />
+</form>" );
$wgOut->returnToMain( false );
}
function delete() {
global $wgUser, $wgOut, $wgMessageCache, $wgRequest;
$fname = 'Article::delete';
- $confirm = $wgRequest->getBool( 'wpConfirm' ) && $wgRequest->wasPosted();
+ $confirm = $wgRequest->wasPosted() &&
+ $wgUser->matchEditToken( $wgRequest->getVal( 'wpEditToken' ) );
$reason = $wgRequest->getText( 'wpReason' );
# This code desperately needs to be totally rewritten
$dbr =& $this->getDB();
$ns = $this->mTitle->getNamespace();
$title = $this->mTitle->getDBkey();
- $old = $dbr->selectRow( 'old',
- array( 'old_text', 'old_flags' ),
+ $revisions = $dbr->select( array( 'page', 'revision' ),
+ array( 'rev_id' ),
array(
- 'old_namespace' => $ns,
- 'old_title' => $title,
- ), $fname, $this->getSelectOptions( array( 'ORDER BY' => 'inverse_timestamp' ) )
+ 'page_namespace' => $ns,
+ 'page_title' => $title,
+ 'rev_page = page_id'
+ ), $fname, $this->getSelectOptions( array( 'ORDER BY' => 'rev_timestamp DESC' ) )
);
- if( $old !== false && !$confirm ) {
+ if( $dbr->numRows( $revisions ) > 1 && !$confirm ) {
$skin=$wgUser->getSkin();
$wgOut->addHTML('<b>'.wfMsg('historywarning'));
$wgOut->addHTML( $skin->historyLink() .'</b>');
}
# Fetch cur_text
- $s = $dbr->selectRow( 'cur',
- array( 'cur_text' ),
+ $s = $dbr->selectRow( array( 'page', 'text' ),
+ array( 'old_text' ),
array(
- 'cur_namespace' => $ns,
- 'cur_title' => $title,
+ 'page_namespace' => $ns,
+ 'page_title' => $title,
+ 'page_latest = old_id'
), $fname, $this->getSelectOptions()
);
#if this is empty, an earlier revision may contain "useful" text
$blanked = false;
- if($s->cur_text != '') {
- $text=$s->cur_text;
+ if($s->old_text != '') {
+ $text=$s->old_text;
} else {
- if($old) {
- $text = Article::getRevisionText( $old );
+ if($old) { # TODO
+ $text = Revision::getRevisionText( $old );
$blanked = true;
}
* Output deletion confirmation dialog
*/
function confirmDelete( $par, $reason ) {
- global $wgOut;
+ global $wgOut, $wgUser;
wfDebug( "Article::confirmDelete\n" );
$formaction = $this->mTitle->escapeLocalURL( 'action=delete' . $par );
$confirm = htmlspecialchars( wfMsg( 'confirm' ) );
- $check = htmlspecialchars( wfMsg( 'confirmcheck' ) );
$delcom = htmlspecialchars( wfMsg( 'deletecomment' ) );
+ $token = htmlspecialchars( $wgUser->editToken() );
$wgOut->addHTML( "
<form id='deleteconfirm' method='post' action=\"{$formaction}\">
<input type='text' size='60' name='wpReason' id='wpReason' value=\"" . htmlspecialchars( $reason ) . "\" />
</td>
</tr>
- <tr>
- <td> </td>
- </tr>
- <tr>
- <td align='right'>
- <input type='checkbox' name='wpConfirm' value='1' id='wpConfirm' />
- </td>
- <td>
- <label for='wpConfirm'>{$check}</label>
- </td>
- </tr>
<tr>
<td> </td>
<td>
</td>
</tr>
</table>
+ <input type='hidden' name='wpEditToken' value=\"{$token}\" />
</form>\n" );
$wgOut->returnToMain( false );
$fname = 'Article::doDelete';
wfDebug( $fname."\n" );
- if (wfRunHooks('ArticleDelete', $this, $wgUser, $reason)) {
+ if (wfRunHooks('ArticleDelete', array(&$this, &$wgUser, &$reason))) {
if ( $this->doDeleteArticle( $reason ) ) {
$deleted = $this->mTitle->getPrefixedText();
$wgOut->setRobotpolicy( 'noindex,nofollow' );
$sk = $wgUser->getSkin();
- $loglink = $sk->makeKnownLink( $wgContLang->getNsText( NS_PROJECT ) .
- ':' . wfMsgForContent( 'dellogpage' ),
+ $loglink = $sk->makeKnownLink( $wgContLang->getNsText( NS_SPECIAL ) .
+ ':Log/delete',
wfMsg( 'deletionlog' ) );
$text = wfMsg( 'deletedtext', $deleted, $loglink );
$wgOut->addHTML( '<p>' . $text . "</p>\n" );
$wgOut->returnToMain( false );
- wfRunHooks('ArticleDeleteComplete', $this, $wgUser, $reason);
+ wfRunHooks('ArticleDeleteComplete', array(&$this, &$wgUser, $reason));
} else {
$wgOut->fatalError( wfMsg( 'cannotdelete' ) );
}
*/
function doDeleteArticle( $reason ) {
global $wgUser;
- global $wgUseSquid, $wgDeferredUpdateList, $wgInternalServer;
+ global $wgUseSquid, $wgDeferredUpdateList, $wgInternalServer, $wgPostCommitUpdateList;
$fname = 'Article::doDeleteArticle';
wfDebug( $fname."\n" );
$this->mTitle->getInternalURL(),
$this->mTitle->getInternalURL( 'history' )
);
- foreach ( $linksTo as $linkTo ) {
- $urls[] = $linkTo->getInternalURL();
- }
- $u = new SquidUpdate( $urls );
- array_push( $wgDeferredUpdateList, $u );
+ $u = SquidUpdate::newFromTitles( $linksTo, $urls );
+ array_push( $wgPostCommitUpdateList, $u );
}
# Client and file cache invalidation
Title::touchArray( $linksTo );
- # Move article and history to the "archive" table
- $archiveTable = $dbw->tableName( 'archive' );
- $oldTable = $dbw->tableName( 'old' );
- $curTable = $dbw->tableName( 'cur' );
- $recentchangesTable = $dbw->tableName( 'recentchanges' );
- $linksTable = $dbw->tableName( 'links' );
- $brokenlinksTable = $dbw->tableName( 'brokenlinks' );
-
- $dbw->insertSelect( 'archive', 'cur',
- array(
- 'ar_namespace' => 'cur_namespace',
- 'ar_title' => 'cur_title',
- 'ar_text' => 'cur_text',
- 'ar_comment' => 'cur_comment',
- 'ar_user' => 'cur_user',
- 'ar_user_text' => 'cur_user_text',
- 'ar_timestamp' => 'cur_timestamp',
- 'ar_minor_edit' => 'cur_minor_edit',
- 'ar_flags' => 0,
- ), array(
- 'cur_namespace' => $ns,
- 'cur_title' => $t,
- ), $fname
- );
- $dbw->insertSelect( 'archive', 'old',
+ // For now, shunt the revision data into the archive table.
+ // Text is *not* removed from the text table; bulk storage
+ // is left intact to avoid breaking block-compression or
+ // immutable storage schemes.
+ //
+ // For backwards compatibility, note that some older archive
+ // table entries will have ar_text and ar_flags fields still.
+ //
+ // In the future, we may keep revisions and mark them with
+ // the rev_deleted field, which is reserved for this purpose.
+ $dbw->insertSelect( 'archive', array( 'page', 'revision' ),
array(
- 'ar_namespace' => 'old_namespace',
- 'ar_title' => 'old_title',
- 'ar_text' => 'old_text',
- 'ar_comment' => 'old_comment',
- 'ar_user' => 'old_user',
- 'ar_user_text' => 'old_user_text',
- 'ar_timestamp' => 'old_timestamp',
- 'ar_minor_edit' => 'old_minor_edit',
- 'ar_flags' => 'old_flags'
+ 'ar_namespace' => 'page_namespace',
+ 'ar_title' => 'page_title',
+ 'ar_comment' => 'rev_comment',
+ 'ar_user' => 'rev_user',
+ 'ar_user_text' => 'rev_user_text',
+ 'ar_timestamp' => 'rev_timestamp',
+ 'ar_minor_edit' => 'rev_minor_edit',
+ 'ar_rev_id' => 'rev_id',
+ 'ar_text_id' => 'rev_text_id',
), array(
- 'old_namespace' => $ns,
- 'old_title' => $t,
+ 'page_id' => $id,
+ 'page_id = rev_page'
), $fname
);
-
+
# Now that it's safely backed up, delete it
-
- $dbw->delete( 'cur', array( 'cur_namespace' => $ns, 'cur_title' => $t ), $fname );
- $dbw->delete( 'old', array( 'old_namespace' => $ns, 'old_title' => $t ), $fname );
+ $dbw->delete( 'revision', array( 'rev_page' => $id ), $fname );
+ $dbw->delete( 'page', array( 'page_id' => $id ), $fname);
+
+ # Clean up recentchanges entries...
$dbw->delete( 'recentchanges', array( 'rc_namespace' => $ns, 'rc_title' => $t ), $fname );
# Finally, clean up the link tables
$wgOut->readOnlyPage( $this->getContent( true ) );
return;
}
+ if( !$wgUser->matchEditToken( $wgRequest->getVal( 'token' ),
+ array( $this->mTitle->getPrefixedText(),
+ $wgRequest->getVal( 'from' ) ) ) ) {
+ $wgOut->setPageTitle( wfMsg( 'rollbackfailed' ) );
+ $wgOut->addWikiText( wfMsg( 'sessionfailure' ) );
+ return;
+ }
$dbw =& wfGetDB( DB_MASTER );
# Enhanced rollback, marks edits rc_bot=1
$n = $this->mTitle->getNamespace();
# Get the last editor, lock table exclusively
- $s = $dbw->selectRow( 'cur',
- array( 'cur_id','cur_user','cur_user_text','cur_comment' ),
- array( 'cur_title' => $tt, 'cur_namespace' => $n ),
- $fname, 'FOR UPDATE'
- );
- if( $s === false ) {
- # Something wrong
+ $dbw->begin();
+ $current = Revision::newFromTitle( $this->mTitle );
+ if( is_null( $current ) ) {
+ # Something wrong... no page?
+ $dbw->rollback();
$wgOut->addHTML( wfMsg( 'notanarticle' ) );
return;
}
- $ut = $dbw->strencode( $s->cur_user_text );
- $uid = $s->cur_user;
- $pid = $s->cur_id;
$from = str_replace( '_', ' ', $wgRequest->getVal( 'from' ) );
- if( $from != $s->cur_user_text ) {
+ if( $from != $current->getUserText() ) {
$wgOut->setPageTitle(wfmsg('rollbackfailed'));
$wgOut->addWikiText( wfMsg( 'alreadyrolled',
htmlspecialchars( $this->mTitle->getPrefixedText()),
htmlspecialchars( $from ),
- htmlspecialchars( $s->cur_user_text ) ) );
- if($s->cur_comment != '') {
+ htmlspecialchars( $current->getUserText() ) ) );
+ if( $current->getComment() != '') {
$wgOut->addHTML(
- wfMsg('editcomment',
- htmlspecialchars( $s->cur_comment ) ) );
+ wfMsg( 'editcomment',
+ htmlspecialchars( $current->getComment() ) ) );
}
return;
}
# Get the last edit not by this guy
- $s = $dbw->selectRow( 'old',
- array( 'old_text','old_user','old_user_text','old_timestamp','old_flags' ),
+ $user = IntVal( $current->getUser() );
+ $user_text = $dbw->addQuotes( $current->getUserText() );
+ $s = $dbw->selectRow( 'revision',
+ array( 'rev_id', 'rev_timestamp' ),
array(
- 'old_namespace' => $n,
- 'old_title' => $tt,
- "old_user <> {$uid} OR old_user_text <> '{$ut}'"
- ), $fname, array( 'FOR UPDATE', 'USE INDEX' => 'name_title_timestamp' )
- );
+ 'rev_page' => $current->getPage(),
+ "rev_user <> {$user} OR rev_user_text <> {$user_text}"
+ ), $fname,
+ array(
+ 'USE INDEX' => 'page_timestamp',
+ 'ORDER BY' => 'rev_timestamp DESC' )
+ );
if( $s === false ) {
# Something wrong
+ $dbw->rollback();
$wgOut->setPageTitle(wfMsg('rollbackfailed'));
$wgOut->addHTML( wfMsg( 'cantrollback' ) );
return;
}
-
+
if ( $bot ) {
# Mark all reverted edits as bot
$dbw->update( 'recentchanges',
array( /* SET */
'rc_bot' => 1
), array( /* WHERE */
- 'rc_user' => $uid,
- "rc_timestamp > '{$s->old_timestamp}'",
+ 'rc_cur_id' => $current->getPage(),
+ 'rc_user_text' => $current->getUserText(),
+ "rc_timestamp > '{$s->rev_timestamp}'",
), $fname
);
}
# Save it!
- $newcomment = wfMsg( 'revertpage', $s->old_user_text, $from );
+ $target = Revision::newFromId( $s->rev_id );
+ $newcomment = wfMsg( 'revertpage', $target->getUserText(), $from );
+
$wgOut->setPagetitle( wfMsg( 'actioncomplete' ) );
$wgOut->setRobotpolicy( 'noindex,nofollow' );
$wgOut->addHTML( '<h2>' . htmlspecialchars( $newcomment ) . "</h2>\n<hr />\n" );
- $this->updateArticle( Article::getRevisionText( $s ), $newcomment, 1, $this->mTitle->userIsWatching(), $bot );
+
+ $this->updateArticle( $target->getText(), $newcomment, 1, $this->mTitle->userIsWatching(), $bot );
Article::onArticleEdit( $this->mTitle );
+
+ $dbw->commit();
$wgOut->returnToMain( false );
}
# talk page
global $wgUser;
-
if ($this->mTitle->getNamespace() == NS_USER_TALK &&
- $this->mTitle->getText() == $wgUser->getName())
- {
- $wgUser->setNewtalk(0);
- $wgUser->saveNewtalk();
+ $this->mTitle->getText() == $wgUser->getName()) {
+ require_once( 'UserTalkUpdate.php' );
+ $u = new UserTalkUpdate( 0, $this->mTitle->getNamespace(), $this->mTitle->getDBkey(), false, false, false );
+ } else {
+ $wgUser->clearNotification( $this->mTitle );
}
+
}
/**
* @private
* @param string $text
*/
- function editUpdates( $text ) {
+ function editUpdates( $text, $summary, $minoredit, $timestamp_of_pagechange) {
global $wgDeferredUpdateList, $wgDBname, $wgMemc;
global $wgMessageCache, $wgUser;
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() - ( 7 * 86400 ) );
- $sql = "DELETE FROM recentchanges WHERE rc_timestamp < '{$cutoff}'";
+ $cutoff = $dbw->timestamp( time() - $wgRCMaxAge );
+ $recentchanges = $dbw->tableName( 'recentchanges' );
+ $sql = "DELETE FROM $recentchanges WHERE rc_timestamp < '{$cutoff}'";
$dbw->query( $sql );
}
$id = $this->getID();
$u = new SearchUpdate( $id, $title, $text );
array_push( $wgDeferredUpdateList, $u );
- # If this is another user's talk page, save a
- # newtalk notification for them
+ # If this is another user's talk page,
+ # create a watchlist entry for this page
if ($this->mTitle->getNamespace() == NS_USER_TALK &&
- $shortTitle != $wgUser->getName())
- {
- $other = User::newFromName($shortTitle);
- $other->setID(User::idFromName($shortTitle));
- $other->setNewtalk(1);
- $other->saveNewtalk();
+ $shortTitle != $wgUser->getName()) {
+ require_once( 'UserTalkUpdate.php' );
+ $u = new UserTalkUpdate( 1, $this->mTitle->getNamespace(), $shortTitle, $summary, $minoredit, $timestamp_of_pagechange);
}
if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
$called = true;
if($this->isFileCacheable()) {
$touched = $this->mTouched;
- if( $this->mTitle->getPrefixedDBkey() == wfMsg( 'mainpage' ) ) {
- # Expire the main page quicker
- $expire = wfUnix2Timestamp( time() - 3600 );
- $touched = max( $expire, $touched );
- }
$cache = new CacheManager( $this->mTitle );
if($cache->isFileCacheGood( $touched )) {
global $wgOut;
return $wgUseFileCache
and (!$wgShowIPinHeader)
and ($this->getID() != 0)
- and ($wgUser->getId() == 0)
+ and ($wgUser->isAnon())
and (!$wgUser->getNewtalk())
and ($this->mTitle->getNamespace() != NS_SPECIAL )
and (empty( $action ) || $action == 'view')
*/
function checkTouched() {
$fname = 'Article::checkTouched';
- $id = $this->getID();
- $dbr =& $this->getDB();
- $s = $dbr->selectRow( 'cur', array( 'cur_touched', 'cur_is_redirect' ),
- array( 'cur_id' => $id ), $fname, $this->getSelectOptions() );
- if( $s !== false ) {
- $this->mTouched = wfTimestamp(TS_MW,$s->cur_touched);
- return !$s->cur_is_redirect;
- } else {
- return false;
+ if( !$this->mDataLoaded ) {
+ $dbr =& $this->getDB();
+ $data = $this->pageDataFromId( $dbr, $this->getId() );
+ if( $data ) {
+ $this->loadPageData( $data );
+ }
}
+ return !$this->mIsRedirect;
}
/**
* Edit an article without doing all that other stuff
+ * The article must already exist; link tables etc
+ * are not updated, caches are not flushed.
*
* @param string $text text submitted
* @param string $comment comment submitted
- * @param integer $minor whereas it's a minor modification
+ * @param bool $minor whereas it's a minor modification
*/
function quickEdit( $text, $comment = '', $minor = 0 ) {
- global $wgUser;
$fname = 'Article::quickEdit';
wfProfileIn( $fname );
$dbw =& wfGetDB( DB_MASTER );
- $ns = $this->mTitle->getNamespace();
- $dbkey = $this->mTitle->getDBkey();
- $encDbKey = $dbw->strencode( $dbkey );
- $timestamp = wfTimestampNow();
-
- # Save to history
- $dbw->insertSelect( 'old', 'cur',
- array(
- 'old_namespace' => 'cur_namespace',
- 'old_title' => 'cur_title',
- 'old_text' => 'cur_text',
- 'old_comment' => 'cur_comment',
- 'old_user' => 'cur_user',
- 'old_user_text' => 'cur_user_text',
- 'old_timestamp' => 'cur_timestamp',
- 'inverse_timestamp' => '99999999999999-cur_timestamp',
- ), array(
- 'cur_namespace' => $ns,
- 'cur_title' => $dbkey,
- ), $fname
- );
-
- # Use the affected row count to determine if the article is new
- $numRows = $dbw->affectedRows();
-
- # Make an array of fields to be inserted
- $fields = array(
- 'cur_text' => $text,
- 'cur_timestamp' => $timestamp,
- 'cur_user' => $wgUser->getID(),
- 'cur_user_text' => $wgUser->getName(),
- 'inverse_timestamp' => wfInvertTimestamp( $timestamp ),
- 'cur_comment' => $comment,
- 'cur_is_redirect' => $this->isRedirect( $text ) ? 1 : 0,
- 'cur_minor_edit' => intval($minor),
- 'cur_touched' => $dbw->timestamp($timestamp),
- );
-
- if ( $numRows ) {
- # Update article
- $fields['cur_is_new'] = 0;
- $dbw->update( 'cur', $fields, array( 'cur_namespace' => $ns, 'cur_title' => $dbkey ), $fname );
- } else {
- # Insert new article
- $fields['cur_is_new'] = 1;
- $fields['cur_namespace'] = $ns;
- $fields['cur_title'] = $dbkey;
- $fields['cur_random'] = $rand = wfRandom();
- $dbw->insert( 'cur', $fields, $fname );
- }
+ $dbw->begin();
+ $revision = new Revision( array(
+ 'page' => $this->getId(),
+ 'text' => $text,
+ 'comment' => $comment,
+ 'minor_edit' => $minor ? 1 : 0,
+ ) );
+ $revisionId = $revision->insertOn( $dbw );
+ $this->updateRevisionOn( $dbw, $revision );
+ $dbw->commit();
+
wfProfileOut( $fname );
}
global $wgHitcounterUpdateFreq;
$dbw =& wfGetDB( DB_MASTER );
- $curTable = $dbw->tableName( 'cur' );
+ $pageTable = $dbw->tableName( 'page' );
$hitcounterTable = $dbw->tableName( 'hitcounter' );
$acchitsTable = $dbw->tableName( 'acchits' );
if( $wgHitcounterUpdateFreq <= 1 ){ //
- $dbw->query( "UPDATE $curTable SET cur_counter = cur_counter + 1 WHERE cur_id = $id" );
+ $dbw->query( "UPDATE $pageTable SET page_counter = page_counter + 1 WHERE page_id = $id" );
return;
}
*/
function onArticleCreate($title_obj) {
- global $wgUseSquid, $wgDeferredUpdateList;
+ global $wgUseSquid, $wgPostCommitUpdateList;
$titles = $title_obj->getBrokenLinksTo();
$urls[] = $linkTitle->getInternalURL();
}
$u = new SquidUpdate( $urls );
- array_push( $wgDeferredUpdateList, $u );
+ array_push( $wgPostCommitUpdateList, $u );
}
# Clear persistent link cache
/**
* Info about this page
+ * Called for ?action=info when $wgAllowPageInfo is on.
+ *
+ * @access public
*/
function info() {
- global $wgUser, $wgTitle, $wgOut, $wgAllowPageInfo;
+ global $wgLang, $wgOut, $wgAllowPageInfo;
$fname = 'Article::info';
if ( !$wgAllowPageInfo ) {
return;
}
- $dbr =& $this->getDB();
-
- $basenamespace = $wgTitle->getNamespace() & (~1);
- $cur_clause = array( 'cur_title' => $wgTitle->getDBkey(), 'cur_namespace' => $basenamespace );
- $old_clause = array( 'old_title' => $wgTitle->getDBkey(), 'old_namespace' => $basenamespace );
- $wl_clause = array( 'wl_title' => $wgTitle->getDBkey(), 'wl_namespace' => $basenamespace );
- $fullTitle = $wgTitle->makeName($basenamespace, $wgTitle->getDBKey());
- $wgOut->setPagetitle( $fullTitle );
+ $page = $this->mTitle->getSubjectPage();
+
+ $wgOut->setPagetitle( $page->getPrefixedText() );
$wgOut->setSubtitle( wfMsg( 'infosubtitle' ));
# first, see if the page exists at all.
- $exists = $dbr->selectField( 'cur', 'COUNT(*)', $cur_clause, $fname, $this->getSelectOptions() );
- if ($exists < 1) {
+ $exists = $page->getArticleId() != 0;
+ if( !$exists ) {
$wgOut->addHTML( wfMsg('noarticletext') );
} else {
- $numwatchers = $dbr->selectField( 'watchlist', 'COUNT(*)', $wl_clause, $fname,
- $this->getSelectOptions() );
- $wgOut->addHTML( "<ul><li>" . wfMsg("numwatchers", $numwatchers) . '</li>' );
- $old = $dbr->selectField( 'old', 'COUNT(*)', $old_clause, $fname, $this->getSelectOptions() );
- $wgOut->addHTML( "<li>" . wfMsg('numedits', $old + 1) . '</li>');
-
- # to find number of distinct authors, we need to do some
- # funny stuff because of the cur/old table split:
- # - first, find the name of the 'cur' author
- # - then, find the number of *other* authors in 'old'
-
- # find 'cur' author
- $cur_author = $dbr->selectField( 'cur', 'cur_user_text', $cur_clause, $fname,
+ $dbr =& $this->getDB( DB_SLAVE );
+ $wl_clause = array(
+ 'wl_title' => $page->getDBkey(),
+ 'wl_namespace' => $page->getNamespace() );
+ $numwatchers = $dbr->selectField(
+ 'watchlist',
+ 'COUNT(*)',
+ $wl_clause,
+ $fname,
$this->getSelectOptions() );
- # find number of 'old' authors excluding 'cur' author
- $authors = $dbr->selectField( 'old', 'COUNT(DISTINCT old_user_text)',
- $old_clause + array( 'old_user_text<>' . $dbr->addQuotes( $cur_author ) ), $fname,
- $this->getSelectOptions() ) + 1;
-
- # now for the Talk page ...
- $cur_clause = array( 'cur_title' => $wgTitle->getDBkey(), 'cur_namespace' => $basenamespace+1 );
- $old_clause = array( 'old_title' => $wgTitle->getDBkey(), 'old_namespace' => $basenamespace+1 );
-
- # does it exist?
- $exists = $dbr->selectField( 'cur', 'COUNT(*)', $cur_clause, $fname, $this->getSelectOptions() );
-
- # number of edits
- if ($exists > 0) {
- $old = $dbr->selectField( 'old', 'COUNT(*)', $old_clause, $fname, $this->getSelectOptions() );
- $wgOut->addHTML( '<li>' . wfMsg("numtalkedits", $old + 1) . '</li>');
+ $pageInfo = $this->pageCountInfo( $page );
+ $talkInfo = $this->pageCountInfo( $page->getTalkPage() );
+
+ $wgOut->addHTML( "<ul><li>" . wfMsg("numwatchers", $wgLang->formatNum( $numwatchers ) ) . '</li>' );
+ $wgOut->addHTML( "<li>" . wfMsg('numedits', $wgLang->formatNum( $pageInfo['edits'] ) ) . '</li>');
+ if( $talkInfo ) {
+ $wgOut->addHTML( '<li>' . wfMsg("numtalkedits", $wgLang->formatNum( $talkInfo['edits'] ) ) . '</li>');
}
- $wgOut->addHTML( '<li>' . wfMsg("numauthors", $authors) . '</li>' );
+ $wgOut->addHTML( '<li>' . wfMsg("numauthors", $wgLang->formatNum( $pageInfo['authors'] ) ) . '</li>' );
+ if( $talkInfo ) {
+ $wgOut->addHTML( '<li>' . wfMsg('numtalkauthors', $wgLang->formatNum( $talkInfo['authors'] ) ) . '</li>' );
+ }
+ $wgOut->addHTML( '</ul>' );
+
+ }
+ }
+
+ /**
+ * Return the total number of edits and number of unique editors
+ * on a given page. If page does not exist, returns false.
+ *
+ * @param Title $title
+ * @return array
+ * @access private
+ */
+ function pageCountInfo( $title ) {
+ $id = $title->getArticleId();
+ if( $id == 0 ) {
+ return false;
+ }
+
+ $dbr =& $this->getDB( DB_SLAVE );
+
+ $rev_clause = array( 'rev_page' => $id );
+ $fname = 'Article::pageCountInfo';
+
+ $edits = $dbr->selectField(
+ 'revision',
+ 'COUNT(rev_page)',
+ $rev_clause,
+ $fname,
+ $this->getSelectOptions() );
+
+ $authors = $dbr->selectField(
+ 'revision',
+ 'COUNT(DISTINCT rev_user_text)',
+ $rev_clause,
+ $fname,
+ $this->getSelectOptions() );
+
+ return array( 'edits' => $edits, 'authors' => $authors );
+ }
- # number of authors
- if ($exists > 0) {
- $cur_author = $dbr->selectField( 'cur', 'cur_user_text', $cur_clause, $fname,
- $this->getSelectOptions() );
- $authors = $dbr->selectField( 'cur', 'COUNT(DISTINCT old_user_text)',
- $old_clause + array( 'old_user_text<>' . $dbr->addQuotes( $cur_author ) ),
- $fname, $this->getSelectOptions() );
+ /**
+ * Return a list of templates used by this article.
+ * Uses the links table to find the templates
+ *
+ * @return array
+ */
+ function getUsedTemplates() {
+ $result = array();
+ $id = $this->mTitle->getArticleID();
- $wgOut->addHTML( '<li>' . wfMsg('numtalkauthors', $authors) . '</li></ul>' );
+ $db =& wfGetDB( DB_SLAVE );
+ $page = $db->tableName( 'page' );
+ $links = $db->tableName( 'links' );
+ $sql = "SELECT page_title ".
+ "FROM $page,$links WHERE l_to=page_id AND l_from={$id} and page_namespace=".NS_TEMPLATE;
+ $res = $db->query( $sql, "Article:getUsedTemplates" );
+ if ( false !== $res ) {
+ if ( $db->numRows( $res ) ) {
+ while ( $row = $db->fetchObject( $res ) ) {
+ $result[] = $row->page_title;
+ }
}
}
+ $db->freeResult( $res );
+ return $result;
}
+
+
}
+
?>
dépôts / lhc / web / wiklou.git / blobdiff