* @param $title Reference to a Title object.
* @param $oldId Integer revision ID, null to fetch from request, zero for current
*/
- function __construct( Title $title, $oldId = null ) {
+ public function __construct( Title $title, $oldId = null ) {
$this->mTitle =& $title;
$this->mOldId = $oldId;
}
*/
public static function newFromID( $id ) {
$t = Title::newFromID( $id );
-
return $t == null ? null : new Article( $t );
}
* from another page on the wiki.
* @param $from Title object.
*/
- function setRedirectedFrom( $from ) {
+ public function setRedirectedFrom( $from ) {
$this->mRedirectedFrom = $from;
}
* @return mixed Title object, or null if this page is not a redirect
*/
public function getRedirectTarget() {
- if(!$this->mTitle || !$this->mTitle->isRedirect())
+ if( !$this->mTitle || !$this->mTitle->isRedirect() )
return null;
- if(!is_null($this->mRedirectTarget))
+ if( !is_null($this->mRedirectTarget) )
return $this->mRedirectTarget;
-
# Query the redirect table
- $dbr = wfGetDB(DB_SLAVE);
- $res = $dbr->select('redirect',
- array('rd_namespace', 'rd_title'),
- array('rd_from' => $this->getID()),
- __METHOD__
+ $dbr = wfGetDB( DB_SLAVE );
+ $res = $dbr->select( 'redirect',
+ array('rd_namespace', 'rd_title'),
+ array('rd_from' => $this->getID()),
+ __METHOD__
);
- $row = $dbr->fetchObject($res);
- if($row)
+ if( $row = $dbr->fetchObject($res) ) {
return $this->mRedirectTarget = Title::makeTitle($row->rd_namespace, $row->rd_title);
-
+ }
# This page doesn't have an entry in the redirect table
return $this->mRedirectTarget = $this->insertRedirect();
}
* @return Title object
*/
public function insertRedirect() {
- $retval = Title::newFromRedirect($this->getContent());
- if(!$retval)
+ $retval = Title::newFromRedirect( $this->getContent() );
+ if( !$retval ) {
return null;
- $dbw = wfGetDB(DB_MASTER);
- $dbw->replace('redirect', array('rd_from'), array(
+ }
+ $dbw = wfGetDB( DB_MASTER );
+ $dbw->replace( 'redirect', array('rd_from'),
+ array(
'rd_from' => $this->getID(),
'rd_namespace' => $retval->getNamespace(),
'rd_title' => $retval->getDBKey()
- ), __METHOD__);
+ ),
+ __METHOD__
+ );
return $retval;
}
* @return mixed false, Title of in-wiki target, or string with URL
*/
public function followRedirectText( $text ) {
- $rt = Title::newFromRedirect( $text );
+ $rt = Title::newFromRedirectRecurse( $text ); // recurse through to only get the final target
# process if title object is valid and not special:userlogout
if( $rt ) {
if( $rt->getInterwiki() != '' ) {
//
// This can be hard to reverse and may produce loops,
// so they may be disabled in the site configuration.
-
$source = $this->mTitle->getFullURL( 'redirect=no' );
return $rt->getFullURL( 'rdfrom=' . urlencode( $source ) );
}
// the rest of the page we're on.
//
// This can be hard to reverse, so they may be disabled.
-
if( $rt->isSpecial( 'Userlogout' ) ) {
// rolleyes
} else {
/**
* get the title object of the article
*/
- function getTitle() {
+ public function getTitle() {
return $this->mTitle;
}
/**
- * Clear the object
- * @private
- */
- function clear() {
+ * Clear the object
+ * @private
+ */
+ public function clear() {
$this->mDataLoaded = false;
$this->mContentLoaded = false;
* Note that getContent/loadContent do not follow redirects anymore.
* If you need to fetch redirectable content easily, try
* the shortcut in Article::followContent()
- * FIXME
- * @todo There are still side-effects in this!
- * In general, you should use the Revision class, not Article,
- * to fetch text for purposes other than page views.
*
* @return Return the text of this revision
*/
- function getContent() {
- global $wgUser, $wgOut, $wgMessageCache;
-
+ public function getContent() {
+ global $wgUser, $wgContLang, $wgOut, $wgMessageCache;
wfProfileIn( __METHOD__ );
-
- if ( 0 == $this->getID() ) {
- wfProfileOut( __METHOD__ );
- $wgOut->setRobotPolicy( 'noindex,nofollow' );
-
- if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
- $wgMessageCache->loadAllMessages();
- $ret = wfMsgWeirdKey ( $this->mTitle->getText() ) ;
+ if( $this->getID() === 0 ) {
+ # If this is a MediaWiki:x message, then load the messages
+ # and return the message value for x.
+ if( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
+ # If this is a system message, get the default text.
+ list( $message, $lang ) = $wgMessageCache->figureMessage( $wgContLang->lcfirst( $this->mTitle->getText() ) );
+ $wgMessageCache->loadAllMessages( $lang );
+ $text = wfMsgGetKey( $message, false, $lang, false );
+ if( wfEmptyMsg( $message, $text ) )
+ $text = '';
} else {
- $ret = wfMsg( $wgUser->isLoggedIn() ? 'noarticletext' : 'noarticletextanon' );
+ $text = wfMsgExt( $wgUser->isLoggedIn() ? 'noarticletext' : 'noarticletextanon', 'parsemag' );
}
-
- return "<div class='noarticletext'>\n$ret\n</div>";
+ wfProfileOut( __METHOD__ );
+ return $text;
} else {
$this->loadContent();
wfProfileOut( __METHOD__ );
return $this->mContent;
}
}
+
+ /**
+ * Get the text of the current revision. No side-effects...
+ *
+ * @return Return the text of the current revision
+ */
+ public function getRawText() {
+ // Check process cache for current revision
+ if( $this->mContentLoaded && $this->mOldId == 0 ) {
+ return $this->mContent;
+ }
+ $rev = Revision::newFromTitle( $this->mTitle );
+ $text = $rev ? $rev->getRawText() : false;
+ return $text;
+ }
/**
* This function returns the text of a section, specified by a number ($section).
* @return string text of the requested section
* @deprecated
*/
- function getSection($text,$section) {
+ public function getSection( $text, $section ) {
global $wgParser;
return $wgParser->getSection( $text, $section );
}
+
+ /**
+ * Get the text that needs to be saved in order to undo all revisions
+ * between $undo and $undoafter. Revisions must belong to the same page,
+ * must exist and must not be deleted
+ * @param $undo Revision
+ * @param $undoafter Revision Must be an earlier revision than $undo
+ * @return mixed string on success, false on failure
+ */
+ public function getUndoText( Revision $undo, Revision $undoafter = null ) {
+ $undo_text = $undo->getText();
+ $undoafter_text = $undoafter->getText();
+ $cur_text = $this->getContent();
+ if ( $cur_text == $undo_text ) {
+ # No use doing a merge if it's just a straight revert.
+ return $undoafter_text;
+ }
+ $undone_text = '';
+ if ( !wfMerge( $undo_text, $undoafter_text, $cur_text, $undone_text ) )
+ return false;
+ return $undone_text;
+ }
/**
* @return int The oldid of the article that is to be shown, 0 for the
* current revision
*/
- function getOldID() {
- if ( is_null( $this->mOldId ) ) {
+ public function getOldID() {
+ if( is_null( $this->mOldId ) ) {
$this->mOldId = $this->getOldIDFromRequest();
}
return $this->mOldId;
global $wgRequest;
$this->mRedirectUrl = false;
$oldid = $wgRequest->getVal( 'oldid' );
- if ( isset( $oldid ) ) {
+ if( isset( $oldid ) ) {
$oldid = intval( $oldid );
- if ( $wgRequest->getVal( 'direction' ) == 'next' ) {
+ if( $wgRequest->getVal( 'direction' ) == 'next' ) {
$nextid = $this->mTitle->getNextRevisionID( $oldid );
- if ( $nextid ) {
+ if( $nextid ) {
$oldid = $nextid;
} else {
$this->mRedirectUrl = $this->mTitle->getFullURL( 'redirect=no' );
}
- } elseif ( $wgRequest->getVal( 'direction' ) == 'prev' ) {
+ } elseif( $wgRequest->getVal( 'direction' ) == 'prev' ) {
$previd = $this->mTitle->getPreviousRevisionID( $oldid );
- if ( $previd ) {
+ if( $previd ) {
$oldid = $previd;
- } else {
- # TODO
}
}
- # unused:
- # $lastid = $oldid;
}
-
- if ( !$oldid ) {
+ if( !$oldid ) {
$oldid = 0;
}
return $oldid;
* Load the revision (including text) into this object
*/
function loadContent() {
- if ( $this->mContentLoaded ) return;
-
+ if( $this->mContentLoaded ) return;
+ wfProfileIn( __METHOD__ );
# Query variables :P
$oldid = $this->getOldID();
-
# Pre-fill content with error message so that if something
# fails we'll have something telling us what we intended.
$this->mOldId = $oldid;
$this->fetchContent( $oldid );
+ wfProfileOut( __METHOD__ );
}
/**
* Fetch a page record with the given conditions
- * @param Database $dbr
- * @param array $conditions
- * @private
+ * @param $dbr Database object
+ * @param $conditions Array
*/
- function pageData( $dbr, $conditions ) {
+ protected function pageData( $dbr, $conditions ) {
$fields = array(
'page_id',
'page_namespace',
}
/**
- * @param Database $dbr
- * @param Title $title
+ * @param $dbr Database object
+ * @param $title Title object
*/
- function pageDataFromTitle( $dbr, $title ) {
+ public function pageDataFromTitle( $dbr, $title ) {
return $this->pageData( $dbr, array(
'page_namespace' => $title->getNamespace(),
'page_title' => $title->getDBkey() ) );
}
/**
- * @param Database $dbr
- * @param int $id
+ * @param $dbr Database
+ * @param $id Integer
*/
- function pageDataFromId( $dbr, $id ) {
+ protected function pageDataFromId( $dbr, $id ) {
return $this->pageData( $dbr, array( 'page_id' => $id ) );
}
* Set the general counter, title etc data loaded from
* some source.
*
- * @param object $data
- * @private
+ * @param $data Database row object or "fromdb"
*/
- function loadPageData( $data = 'fromdb' ) {
- if ( $data === 'fromdb' ) {
+ public function loadPageData( $data = 'fromdb' ) {
+ if( $data === 'fromdb' ) {
$dbr = wfGetDB( DB_MASTER );
$data = $this->pageDataFromId( $dbr, $this->getId() );
}
$lc = LinkCache::singleton();
- if ( $data ) {
+ if( $data ) {
$lc->addGoodLinkObj( $data->page_id, $this->mTitle, $data->page_len, $data->page_is_redirect );
$this->mTitle->mArticleID = $data->page_id;
- # Old-fashioned restrictions.
+ # Old-fashioned restrictions
$this->mTitle->loadRestrictions( $data->page_restrictions );
$this->mCounter = $data->page_counter;
$this->mIsRedirect = $data->page_is_redirect;
$this->mLatest = $data->page_latest;
} else {
- if ( is_object( $this->mTitle ) ) {
+ if( is_object( $this->mTitle ) ) {
$lc->addBadLinkObj( $this->mTitle );
}
$this->mTitle->mArticleID = 0;
/**
* Get text of an article from database
* Does *NOT* follow redirects.
- * @param int $oldid 0 for whatever the latest revision is
+ * @param $oldid Int: 0 for whatever the latest revision is
* @return string
*/
function fetchContent( $oldid = 0 ) {
- if ( $this->mContentLoaded ) {
+ if( $this->mContentLoaded ) {
return $this->mContent;
}
*
* @param $x Mixed: FIXME
*/
- function forUpdate( $x = NULL ) {
+ public function forUpdate( $x = NULL ) {
return wfSetVar( $this->mForUpdate, $x );
}
* the default
* @return Array: options
*/
- function getSelectOptions( $options = '' ) {
- if ( $this->mForUpdate ) {
- if ( is_array( $options ) ) {
+ protected function getSelectOptions( $options = '' ) {
+ if( $this->mForUpdate ) {
+ if( is_array( $options ) ) {
$options[] = 'FOR UPDATE';
} else {
$options = 'FOR UPDATE';
/**
* @return int Page ID
*/
- function getID() {
+ public function getID() {
if( $this->mTitle ) {
return $this->mTitle->getArticleID();
} else {
/**
* @return bool Whether or not the page exists in the database
*/
- function exists() {
- return $this->getId() != 0;
+ public function exists() {
+ return $this->getId() > 0;
+ }
+
+ /**
+ * Check if this page is something we're going to be showing
+ * some sort of sensible content for. If we return false, page
+ * views (plain action=view) will return an HTTP 404 response,
+ * so spiders and robots can know they're following a bad link.
+ *
+ * @return bool
+ */
+ public function hasViewableContent() {
+ return $this->exists() || $this->mTitle->isAlwaysKnown();
}
/**
* @return int The view count for the page
*/
- function getCount() {
- if ( -1 == $this->mCounter ) {
+ public function getCount() {
+ if( -1 == $this->mCounter ) {
$id = $this->getID();
- if ( $id == 0 ) {
+ 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() );
+ $this->mCounter = $dbr->selectField( 'page',
+ 'page_counter',
+ array( 'page_id' => $id ),
+ __METHOD__,
+ $this->getSelectOptions()
+ );
}
}
return $this->mCounter;
* @param $text String: text to analyze
* @return bool
*/
- function isCountable( $text ) {
+ public function isCountable( $text ) {
global $wgUseCommaCount;
$token = $wgUseCommaCount ? ',' : '[[';
- return
- $this->mTitle->isContentPage()
- && !$this->isRedirect( $text )
- && in_string( $token, $text );
+ return $this->mTitle->isContentPage() && !$this->isRedirect($text) && in_string($token,$text);
}
/**
* @param $text String: FIXME
* @return bool
*/
- function isRedirect( $text = false ) {
- if ( $text === false ) {
- if ( $this->mDataLoaded )
+ public function isRedirect( $text = false ) {
+ if( $text === false ) {
+ if( $this->mDataLoaded ) {
return $this->mIsRedirect;
-
+ }
// Apparently loadPageData was never called
$this->loadContent();
- $titleObj = Title::newFromRedirect( $this->fetchContent() );
+ $titleObj = Title::newFromRedirectRecurse( $this->fetchContent() );
} else {
$titleObj = Title::newFromRedirect( $text );
}
* to this page (and it exists).
* @return bool
*/
- function isCurrent() {
+ public function isCurrent() {
# If no oldid, this is the current version.
- if ($this->getOldID() == 0)
+ if( $this->getOldID() == 0 ) {
return true;
-
- return $this->exists() &&
- isset( $this->mRevision ) &&
- $this->mRevision->isCurrent();
+ }
+ return $this->exists() && isset($this->mRevision) && $this->mRevision->isCurrent();
}
/**
* Loads everything except the text
* This isn't necessary for all uses, so it's only done if needed.
- * @private
*/
- function loadLastEdit() {
- if ( -1 != $this->mUser )
+ protected function loadLastEdit() {
+ if( -1 != $this->mUser )
return;
# New or non-existent articles have no user information
$id = $this->getID();
- if ( 0 == $id ) return;
+ if( 0 == $id ) return;
$this->mLastRevision = Revision::loadFromPageId( wfGetDB( DB_MASTER ), $id );
if( !is_null( $this->mLastRevision ) ) {
}
}
- function getTimestamp() {
+ public function getTimestamp() {
// Check if the field has been filled by ParserCache::get()
- if ( !$this->mTimestamp ) {
+ if( !$this->mTimestamp ) {
$this->loadLastEdit();
}
return wfTimestamp(TS_MW, $this->mTimestamp);
}
- function getUser() {
+ public function getUser() {
$this->loadLastEdit();
return $this->mUser;
}
- function getUserText() {
+ public function getUserText() {
$this->loadLastEdit();
return $this->mUserText;
}
- function getComment() {
+ public function getComment() {
$this->loadLastEdit();
return $this->mComment;
}
- function getMinorEdit() {
+ public function getMinorEdit() {
$this->loadLastEdit();
return $this->mMinorEdit;
}
- function getRevIdFetched() {
+ /* Use this to fetch the rev ID used on page views */
+ public function getRevIdFetched() {
$this->loadLastEdit();
return $this->mRevIdFetched;
}
* @param $limit Integer: default 0.
* @param $offset Integer: default 0.
*/
- function getContributors($limit = 0, $offset = 0) {
+ public function getContributors($limit = 0, $offset = 0) {
# XXX: this is expensive; cache this info somewhere.
$contribs = array();
GROUP BY rev_user, rev_user_text, user_real_name
ORDER BY timestamp DESC";
- if ($limit > 0) { $sql .= ' LIMIT '.$limit; }
- if ($offset > 0) { $sql .= ' OFFSET '.$offset; }
+ if($limit > 0) { $sql .= ' LIMIT '.$limit; }
+ if($offset > 0) { $sql .= ' OFFSET '.$offset; }
$sql .= ' '. $this->getSelectOptions();
* This is the default action of the script: just view the page of
* the given title.
*/
- function view() {
+ public function view() {
global $wgUser, $wgOut, $wgRequest, $wgContLang;
global $wgEnableParserCache, $wgStylePath, $wgParser;
global $wgUseTrackbacks, $wgNamespaceRobotPolicies, $wgArticleRobotPolicies;
global $wgDefaultRobotPolicy;
- $sk = $wgUser->getSkin();
wfProfileIn( __METHOD__ );
- $parserCache = ParserCache::singleton();
- $ns = $this->mTitle->getNamespace(); # shortcut
-
# Get variables from query string
$oldid = $this->getOldID();
+ # Try file cache
+ if( $oldid === 0 && $this->checkTouched() ) {
+ global $wgUseETag;
+ if( $wgUseETag ) {
+ $parserCache = ParserCache::singleton();
+ $wgOut->setETag( $parserCache->getETag($this,$wgUser) );
+ }
+ if( $wgOut->checkLastModified( $this->getTouched() ) ) {
+ wfProfileOut( __METHOD__ );
+ return;
+ } else if( $this->tryFileCache() ) {
+ # tell wgOut that output is taken care of
+ $wgOut->disable();
+ $this->viewUpdates();
+ wfProfileOut( __METHOD__ );
+ return;
+ }
+ }
+
+ $ns = $this->mTitle->getNamespace(); # shortcut
+ $sk = $wgUser->getSkin();
+
# getOldID may want us to redirect somewhere else
- if ( $this->mRedirectUrl ) {
+ if( $this->mRedirectUrl ) {
$wgOut->redirect( $this->mRedirectUrl );
wfProfileOut( __METHOD__ );
return;
$rdfrom = $wgRequest->getVal( 'rdfrom' );
$diffOnly = $wgRequest->getBool( 'diffonly', $wgUser->getOption( 'diffonly' ) );
$purge = $wgRequest->getVal( 'action' ) == 'purge';
+ $return404 = false;
$wgOut->setArticleFlag( true );
# Discourage indexing of printable versions, but encourage following
if( $wgOut->isPrintable() ) {
$policy = 'noindex,follow';
- } elseif ( isset( $wgArticleRobotPolicies[$this->mTitle->getPrefixedText()] ) ) {
+ } elseif( isset( $wgArticleRobotPolicies[$this->mTitle->getPrefixedText()] ) ) {
$policy = $wgArticleRobotPolicies[$this->mTitle->getPrefixedText()];
} elseif( isset( $wgNamespaceRobotPolicies[$ns] ) ) {
# Honour customised robot policies for this namespace
}
$wgOut->setRobotPolicy( $policy );
+ # Allow admins to see deleted content if explicitly requested
+ $delId = $diff ? $diff : $oldid;
+ $unhide = $wgRequest->getInt('unhide') == 1 && $wgUser->matchEditToken( $wgRequest->getVal('token'), $delId );
# If we got diff and oldid in the query, we want to see a
# diff page instead of the article.
- if ( !is_null( $diff ) ) {
+ if( !is_null( $diff ) ) {
$wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
- $diff = $wgRequest->getVal( 'diff' );
$htmldiff = $wgRequest->getVal( 'htmldiff' , false);
- $de = new DifferenceEngine( $this->mTitle, $oldid, $diff, $rcid, $purge, $htmldiff);
+ $de = new DifferenceEngine( $this->mTitle, $oldid, $diff, $rcid, $purge, $htmldiff, $unhide );
// DifferenceEngine directly fetched the revision:
$this->mRevIdFetched = $de->mNewid;
$de->showDiffPage( $diffOnly );
wfProfileOut( __METHOD__ );
return;
}
-
- if ( empty( $oldid ) && $this->checkTouched() ) {
- $wgOut->setETag($parserCache->getETag($this, $wgUser));
-
- if( $wgOut->checkLastModified( $this->mTouched ) ){
- wfProfileOut( __METHOD__ );
- return;
- } else if ( $this->tryFileCache() ) {
- # tell wgOut that output is taken care of
- $wgOut->disable();
- $this->viewUpdates();
- wfProfileOut( __METHOD__ );
- return;
+
+ if( $ns == NS_USER || $ns == NS_USER_TALK ) {
+ # User/User_talk subpages are not modified. (bug 11443)
+ if( !$this->mTitle->isSubpage() ) {
+ $block = new Block();
+ if( $block->load( $this->mTitle->getBaseText() ) ) {
+ $wgOut->setRobotpolicy( 'noindex,nofollow' );
+ }
}
}
# Should the parser cache be used?
$pcache = $this->useParserCache( $oldid );
wfDebug( 'Article::view using parser cache: ' . ($pcache ? 'yes' : 'no' ) . "\n" );
- if ( $wgUser->getOption( 'stubthreshold' ) ) {
+ if( $wgUser->getOption( 'stubthreshold' ) ) {
wfIncrStats( 'pcache_miss_stub' );
}
$wasRedirected = false;
- if ( isset( $this->mRedirectedFrom ) ) {
+ 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 ) ) ) {
+ if( wfRunHooks( 'ArticleViewRedirect', array( &$this ) ) ) {
$redir = $sk->makeKnownLinkObj( $this->mRedirectedFrom, '', 'redirect=no' );
- $s = wfMsg( 'redirectedfrom', $redir );
+ $s = wfMsgExt( 'redirectedfrom', array( 'parseinline', 'replaceafter' ), $redir );
$wgOut->setSubtitle( $s );
// Set the fragment if one was specified in the redirect
- if ( strval( $this->mTitle->getFragment() ) != '' ) {
+ if( strval( $this->mTitle->getFragment() ) != '' ) {
$fragment = Xml::escapeJsString( $this->mTitle->getFragmentForURL() );
$wgOut->addInlineScript( "redirectToFragment(\"$fragment\");" );
}
$wasRedirected = true;
}
- } elseif ( !empty( $rdfrom ) ) {
+ } 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 ) ) {
$redir = $sk->makeExternalLink( $rdfrom, $rdfrom );
- $s = wfMsg( 'redirectedfrom', $redir );
+ $s = wfMsgExt( 'redirectedfrom', array( 'parseinline', 'replaceafter' ), $redir );
$wgOut->setSubtitle( $s );
$wasRedirected = true;
}
}
-
- # Optional notices on a per-namespace and per-page basis
- $mw = MagicWord::get( 'noheader' );
- $ignoreheader = false;
- $text = $this->getContent();
- if( $mw->match( $text ) ) {
- $ignoreheader = true;
- }
- $pageheader_ns = 'pageheader-'.$this->mTitle->getNamespace();
- $pageheader_page = $pageheader_ns.'-'.$this->mTitle->getDBkey();
- if ( !wfEmptyMsg( $pageheader_ns, wfMsgForContent( $pageheader_ns ) ) && !$ignoreheader ) {
- $wgOut->addWikiText( wfMsgForContent( $pageheader_ns ) );
- }
-
- if ( MWNamespace::hasSubpages( $this->mTitle->getNamespace() ) && !$ignoreheader ) {
- $parts = explode( '/', $this->mTitle->getDBkey() );
- $pageheader_base = $pageheader_ns;
- while ( count( $parts ) > 0 ) {
- $pageheader_base .= '-'.array_shift( $parts );
- if ( !wfEmptyMsg( $pageheader_base, wfMsgForContent( $pageheader_base ) ) ) {
- $wgOut->addWikiText( wfMsgForContent( $pageheader_base ) );
- }
- }
- } else if ( !wfEmptyMsg( $pageheader_page, wfMsgForContent( $pageheader_page ) ) && !$ignoreheader ) {
- $wgOut->addWikiText( wfMsgForContent( $pageheader_page ) );
- }
$outputDone = false;
wfRunHooks( 'ArticleViewHeader', array( &$this, &$outputDone, &$pcache ) );
- if ( $pcache ) {
- if ( $wgOut->tryParserCache( $this, $wgUser ) ) {
- // Ensure that UI elements requiring revision ID have
- // the correct version information.
- $wgOut->setRevisionId( $this->mLatest );
- $outputDone = true;
- }
+ if( $pcache && $wgOut->tryParserCache( $this, $wgUser ) ) {
+ // Ensure that UI elements requiring revision ID have
+ // the correct version information.
+ $wgOut->setRevisionId( $this->mLatest );
+ $outputDone = true;
}
# Fetch content and check for errors
- if ( !$outputDone ) {
+ if( !$outputDone ) {
# If the article does not exist and was deleted, show the log
- if ($this->getID() == 0) {
- $loglist = new LogEventsList( $wgUser->getSkin(), $wgOut );
- $pager = new LogPager( $loglist, 'delete', false, $this->mTitle->getPrefixedText() );
- $count = $pager->getNumRows();
- if( $count > 0 ) {
- $pager->mLimit = 10;
- $wgOut->addHtml( '<div id="mw-deleted-notice">' );
- $wgOut->addWikiMsg( 'deleted-notice' );
- $wgOut->addHTML(
- $loglist->beginLogEventsList() .
- $pager->getBody() .
- $loglist->endLogEventsList()
- );
- if($count > 10){
- $wgOut->addHtml( $wgUser->getSkin()->link(
- SpecialPage::getTitleFor( 'Log' ),
- wfMsgHtml( 'deletelog-fulllog' ),
- array(),
- array(
- 'type' => 'delete',
- 'page' => $this->mTitle->getPrefixedText() ) ) );
- }
- $wgOut->addHtml( '</div>' );
- }
+ if( $this->getID() == 0 ) {
+ $this->showDeletionLog();
}
- if ( $text === false ) {
+ $text = $this->getContent();
+ // For now, check also for ID until getContent actually returns
+ // false for pages that do not exists
+ if( $text === false || $this->getID() === 0 ) {
# Failed to load, replace text with error message
$t = $this->mTitle->getPrefixedText();
if( $oldid ) {
- $d = wfMsgExt( 'missingarticle-rev', array( 'escape' ), $oldid );
- $text = wfMsg( 'missing-article', $t, $d );
- } else {
- $text = wfMsg( 'noarticletext' );
+ $d = wfMsgExt( 'missingarticle-rev', 'escape', $oldid );
+ $text = wfMsgExt( 'missing-article', 'parsemag', $t, $d );
+ // Always use page content for pages in the MediaWiki namespace
+ // since it contains the default message
+ } elseif ( $this->mTitle->getNamespace() != NS_MEDIAWIKI ) {
+ $text = wfMsgExt( 'noarticletext', 'parsemag' );
}
}
+
+ # Non-existent pages
+ if( $this->getID() === 0 ) {
+ $wgOut->setRobotPolicy( 'noindex,nofollow' );
+ $text = "<div class='noarticletext'>\n$text\n</div>";
+ if( !$this->hasViewableContent() ) {
+ // If there's no backing content, send a 404 Not Found
+ // for better machine handling of broken links.
+ $return404 = true;
+ }
+ }
+
+ if( $return404 ) {
+ $wgRequest->response()->header( "HTTP/1.x 404 Not Found" );
+ }
# Another whitelist check in case oldid is altering the title
- if ( !$this->mTitle->userCanRead() ) {
+ if( !$this->mTitle->userCanRead() ) {
$wgOut->loginToUse();
$wgOut->output();
+ $wgOut->disable();
wfProfileOut( __METHOD__ );
- exit;
+ return;
}
+
+ # For ?curid=x urls, disallow indexing
+ if( $wgRequest->getInt('curid') )
+ $wgOut->setRobotPolicy( 'noindex,follow' );
# We're looking at an old revision
- if ( !empty( $oldid ) ) {
+ if( !empty( $oldid ) ) {
$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 );
+ # Allow admins to see deleted content if explicitly requested
if( $this->mRevision->isDeleted( Revision::DELETED_TEXT ) ) {
- if( !$this->mRevision->userCan( Revision::DELETED_TEXT ) ) {
+ if( !$unhide || !$this->mRevision->userCan(Revision::DELETED_TEXT) ) {
$wgOut->addWikiMsg( 'rev-deleted-text-permission' );
$wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
wfProfileOut( __METHOD__ );
// Pages containing custom CSS or JavaScript get special treatment
if( $this->mTitle->isCssOrJsPage() || $this->mTitle->isCssJsSubpage() ) {
- $wgOut->addHtml( wfMsgExt( 'clearyourcache', 'parse' ) );
+ $wgOut->addHTML( wfMsgExt( 'clearyourcache', 'parse' ) );
// Give hooks a chance to customise the output
if( wfRunHooks( 'ShowRawCssJs', array( $this->mContent, $this->mTitle, $wgOut ) ) ) {
// Wrap the whole lot in a <pre> and don't parse
$m = array();
preg_match( '!\.(css|js)$!u', $this->mTitle->getText(), $m );
- $wgOut->addH
tml( "<pre class=\"mw-code mw-{$m[1]}\" dir=\"ltr\">\n" );
- $wgOut->addHtml( htmlspecialchars( $this->mContent ) );
- $wgOut->addHtml( "\n</pre>\n" );
+ $wgOut->addH
TML( "<pre class=\"mw-code mw-{$m[1]}\" dir=\"ltr\">\n" );
+ $wgOut->addHTML( htmlspecialchars( $this->mContent ) );
+ $wgOut->addHTML( "\n</pre>\n" );
}
- } else if ( $rt = Title::newFromRedirect( $text ) ) {
+ } else if( $rt = Title::newFromRedirectArray( $text ) ) { # get an array of redirect targets
# Don't append the subtitle if this was an old revision
$wgOut->addHTML( $this->viewRedirect( $rt, !$wasRedirected && $this->isCurrent() ) );
$parseout = $wgParser->parse($text, $this->mTitle, ParserOptions::newFromUser($wgUser));
$wgOut->addParserOutputNoText( $parseout );
- } else if ( $pcache ) {
+ } else if( $pcache ) {
# Display content and save to parser cache
$this->outputWikiText( $text );
} else {
$time += wfTime();
# Timing hack
- if ( $time > 3 ) {
+ if( $time > 3 ) {
wfDebugLog( 'slow-parse', sprintf( "%-5.2f %s", $time,
$this->mTitle->getPrefixedDBkey()));
}
# If we have been passed an &rcid= parameter, we want to give the user a
# chance to mark this new article as patrolled.
- if( !is_null( $rcid ) && $rcid != 0 && $wgUser->isAllowed( 'patrol' ) && $this->mTitle->exists() ) {
+ if( !empty($rcid) && $this->mTitle->exists() && $this->mTitle->quickUserCan('patrol') ) {
$wgOut->addHTML(
"<div class='patrollink'>" .
wfMsgHtml( 'markaspatrolledlink',
}
# Trackbacks
- if ($wgUseTrackbacks)
+ if( $wgUseTrackbacks ) {
$this->addTrackbacks();
+ }
$this->viewUpdates();
wfProfileOut( __METHOD__ );
}
+
+ protected function showDeletionLog() {
+ global $wgUser, $wgOut;
+ $loglist = new LogEventsList( $wgUser->getSkin(), $wgOut );
+ $pager = new LogPager( $loglist, 'delete', false, $this->mTitle->getPrefixedText() );
+ if( $pager->getNumRows() > 0 ) {
+ $pager->mLimit = 10;
+ $wgOut->addHTML( '<div class="mw-warning-with-logexcerpt">' );
+ $wgOut->addWikiMsg( 'deleted-notice' );
+ $wgOut->addHTML(
+ $loglist->beginLogEventsList() .
+ $pager->getBody() .
+ $loglist->endLogEventsList()
+ );
+ if( $pager->getNumRows() > 10 ) {
+ $wgOut->addHTML( $wgUser->getSkin()->link(
+ SpecialPage::getTitleFor( 'Log' ),
+ wfMsgHtml( 'deletelog-fulllog' ),
+ array(),
+ array( 'type' => 'delete', 'page' => $this->mTitle->getPrefixedText() )
+ ) );
+ }
+ $wgOut->addHTML( '</div>' );
+ }
+ }
/*
* Should the parser cache be used?
/**
* View redirect
- * @param Title $target Title of destination to redirect
- * @param Bool $appendSubtitle Object[optional]
- * @param Bool $forceKnown Should the image be shown as a bluelink regardless of existence?
+ * @param $target Title object or Array of destination(s) to redirect
+ * @param $appendSubtitle Boolean [optional]
+ * @param $forceKnown Boolean: should the image be shown as a bluelink regardless of existence?
*/
public function viewRedirect( $target, $appendSubtitle = true, $forceKnown = false ) {
global $wgParser, $wgOut, $wgContLang, $wgStylePath, $wgUser;
-
# Display redirect
+ if( !is_array( $target ) ) {
+ $target = array( $target );
+ }
$imageDir = $wgContLang->isRTL() ? 'rtl' : 'ltr';
- $imageUrl = $wgStylePath.'/common/images/redirect' . $imageDir . '.png';
-
+ $imageUrl = $wgStylePath . '/common/images/redirect' . $imageDir . '.png';
+ $imageUrl2 = $wgStylePath . '/common/images/nextredirect' . $imageDir . '.png';
+ $alt2 = $wgContLang->isRTL() ? '←' : '→'; // should -> and <- be used instead of entities?
+
if( $appendSubtitle ) {
$wgOut->appendSubtitle( wfMsgHtml( 'redirectpagesub' ) );
}
$sk = $wgUser->getSkin();
- if ( $forceKnown )
- $link = $sk->makeKnownLinkObj( $target, htmlspecialchars( $target->getFullText() ) );
- else
- $link = $sk->makeLinkObj( $target, htmlspecialchars( $target->getFullText() ) );
-
+ // the loop prepends the arrow image before the link, so the first case needs to be outside
+ $title = array_shift( $target );
+ if( $forceKnown ) {
+ $link = $sk->makeKnownLinkObj( $title, htmlspecialchars( $title->getFullText() ) );
+ } else {
+ $link = $sk->makeLinkObj( $title, htmlspecialchars( $title->getFullText() ) );
+ }
+ // automatically append redirect=no to each link, since most of them are redirect pages themselves
+ foreach( $target as $rt ) {
+ if( $forceKnown ) {
+ $link .= '<img src="'.$imageUrl2.'" alt="'.$alt2.' " />'
+ . $sk->makeKnownLinkObj( $rt, htmlspecialchars( $rt->getFullText() ) );
+ } else {
+ $link .= '<img src="'.$imageUrl2.'" alt="'.$alt2.' " />'
+ . $sk->makeLinkObj( $rt, htmlspecialchars( $rt->getFullText() ) );
+ }
+ }
return '<img src="'.$imageUrl.'" alt="#REDIRECT " />' .
'<span class="redirectText">'.$link.'</span>';
}
- function addTrackbacks() {
+ public function addTrackbacks() {
global $wgOut, $wgUser;
-
- $dbr = wfGetDB(DB_SLAVE);
- $tbs = $dbr->select(
- /* FROM */ 'trackbacks',
- /* SELECT */ array('tb_id', 'tb_title', 'tb_url', 'tb_ex', 'tb_name'),
- /* WHERE */ array('tb_page' => $this->getID())
+ $dbr = wfGetDB( DB_SLAVE );
+ $tbs = $dbr->select( 'trackbacks',
+ array('tb_id', 'tb_title', 'tb_url', 'tb_ex', 'tb_name'),
+ array('tb_page' => $this->getID() )
);
-
- if (!$dbr->numrows($tbs))
- return;
+ if( !$dbr->numRows($tbs) ) return;
$tbtext = "";
- while ($o = $dbr->fetchObject($tbs)) {
+ while( $o = $dbr->fetchObject($tbs) ) {
$rmvtxt = "";
- if ($wgUser->isAllowed( 'trackback' )) {
- $delurl = $this->mTitle->getFullURL("action=deletetrackback&tbid="
- . $o->tb_id . "&token=" . urlencode( $wgUser->editToken() ) );
+ if( $wgUser->isAllowed( 'trackback' ) ) {
+ $delurl = $this->mTitle->getFullURL("action=deletetrackback&tbid=" .
+ $o->tb_id . "&token=" . urlencode( $wgUser->editToken() ) );
$rmvtxt = wfMsg( 'trackbackremove', htmlspecialchars( $delurl ) );
}
$tbtext .= "\n";
$rmvtxt);
}
$wgOut->addWikiMsg( 'trackbackbox', $tbtext );
+ $this->mTitle->invalidateCache();
}
- function deletetrackback() {
+ public function deletetrackback() {
global $wgUser, $wgRequest, $wgOut, $wgTitle;
-
- if (!$wgUser->matchEditToken($wgRequest->getVal('token'))) {
+ if( !$wgUser->matchEditToken($wgRequest->getVal('token')) ) {
$wgOut->addWikiMsg( 'sessionfailure' );
return;
}
$permission_errors = $this->mTitle->getUserPermissionsErrors( 'delete', $wgUser );
-
- if (count($permission_errors)>0)
- {
+ if( count($permission_errors) ) {
$wgOut->showPermissionsErrorPage( $permission_errors );
return;
}
- $db = wfGetDB(DB_MASTER);
- $db->delete('trackbacks', array('tb_id' => $wgRequest->getInt('tbid')));
- $wgTitle->invalidateCache();
- $wgOut->addWikiMsg('trackbackdeleteok');
+ $db = wfGetDB( DB_MASTER );
+ $db->delete( 'trackbacks', array('tb_id' => $wgRequest->getInt('tbid')) );
+
+ $wgOut->addWikiMsg( 'trackbackdeleteok' );
+ $this->mTitle->invalidateCache();
}
- function render() {
+ public function render() {
global $wgOut;
-
$wgOut->setArticleBodyOnly(true);
$this->view();
}
/**
* Handle action=purge
*/
- function purge() {
+ public function purge() {
global $wgUser, $wgRequest, $wgOut;
-
- if ( $wgUser->isAllowed( 'purge' ) || $wgRequest->wasPosted() ) {
+ if( $wgUser->isAllowed( 'purge' ) || $wgRequest->wasPosted() ) {
if( wfRunHooks( 'ArticlePurge', array( &$this ) ) ) {
$this->doPurge();
$this->view();
}
} else {
- $msg = $wgOut->parse( wfMsg( 'confirm_purge' ) );
- $action = htmlspecialchars( $_SERVER['REQUEST_URI'] );
- $button = htmlspecialchars( wfMsg( 'confirm_purge_button' ) );
- $msg = str_replace( '$1',
- "<form method=\"post\" action=\"$action\">\n" .
- "<input type=\"submit\" name=\"submit\" value=\"$button\" />\n" .
- "</form>\n", $msg );
-
+ $action = htmlspecialchars( $wgRequest->getRequestURL() );
+ $button = wfMsgExt( 'confirm_purge_button', array('escapenoentities') );
+ $form = "<form method=\"post\" action=\"$action\">\n" .
+ "<input type=\"submit\" name=\"submit\" value=\"$button\" />\n" .
+ "</form>\n";
+ $top = wfMsgExt( 'confirm-purge-top', array('parse') );
+ $bottom = wfMsgExt( 'confirm-purge-bottom', array('parse') );
$wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
$wgOut->setRobotPolicy( 'noindex,nofollow' );
- $wgOut->addHTML( $msg );
+ $wgOut->addHTML( $top . $form . $bottom );
}
}
/**
* Perform the actions of a page purging
*/
- function doPurge() {
+ public function doPurge() {
global $wgUseSquid;
// Invalidate the cache
$this->mTitle->invalidateCache();
- if ( $wgUseSquid ) {
+ if( $wgUseSquid ) {
// Commit the transaction before the purge is sent
$dbw = wfGetDB( DB_MASTER );
$dbw->immediateCommit();
$update = SquidUpdate::newSimplePurge( $this->mTitle );
$update->doUpdate();
}
- if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
+ if( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
global $wgMessageCache;
- if ( $this->getID() == 0 ) {
+ if( $this->getID() == 0 ) {
$text = false;
} else {
- $text = $this->getContent();
+ $text = $this->getRawText();
}
$wgMessageCache->replace( $this->mTitle->getDBkey(), $text );
}
* or else the record will be left in a funky state.
* Best if all done inside a transaction.
*
- * @param Database $dbw
- * @return int The newly created page_id key, or false if the title already existed
+ * @param $dbw Database
+ * @return int The newly created page_id key, or false if the title already existed
* @private
*/
- function insertOn( $dbw ) {
+ public function insertOn( $dbw ) {
wfProfileIn( __METHOD__ );
$page_id = $dbw->nextSequenceValue( 'page_page_id_seq' );
), __METHOD__, 'IGNORE' );
$affected = $dbw->affectedRows();
- if ( $affected ) {
+ if( $affected ) {
$newid = $dbw->insertId();
$this->mTitle->resetArticleId( $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.
- * @param bool $lastRevIsRedirect If given, will optimize adding and
- * removing rows in redirect table.
+ * @param $dbw Database object
+ * @param $revision Revision: For ID number, and text used to set
+ length and redirect status fields
+ * @param $lastRevision Integer: if given, will not overwrite the page field
+ * when different from the currently set value.
+ * Giving 0 indicates the new page flag should be set
+ * on.
+ * @param $lastRevIsRedirect Boolean: if given, will optimize adding and
+ * removing rows in redirect table.
* @return bool true on success, false on failure
* @private
*/
- function updateRevisionOn( &$dbw, $revision, $lastRevision = null, $lastRevIsRedirect = null ) {
+ public function updateRevisionOn( &$dbw, $revision, $lastRevision = null, $lastRevIsRedirect = null ) {
wfProfileIn( __METHOD__ );
$text = $revision->getText();
__METHOD__ );
$result = $dbw->affectedRows() != 0;
-
- if ($result) {
+ if( $result ) {
$this->updateRedirectOn( $dbw, $rt, $lastRevIsRedirect );
}
/**
* Add row to the redirect table if this is a redirect, remove otherwise.
*
- * @param Database $dbw
+ * @param $dbw Database
* @param $redirectTitle a title object pointing to the redirect target,
- * or NULL if this is not a redirect
- * @param bool $lastRevIsRedirect If given, will optimize adding and
- * removing rows in redirect table.
+ * or NULL if this is not a redirect
+ * @param $lastRevIsRedirect If given, will optimize adding and
+ * removing rows in redirect table.
* @return bool true on success, false on failure
* @private
*/
- function updateRedirectOn( &$dbw, $redirectTitle, $lastRevIsRedirect = null ) {
-
+ public function updateRedirectOn( &$dbw, $redirectTitle, $lastRevIsRedirect = null ) {
// Always update redirects (target link might have changed)
// Update/Insert if we don't know if the last revision was a redirect or not
// Delete if changing from redirect to non-redirect
$isRedirect = !is_null($redirectTitle);
- if ($isRedirect || is_null($lastRevIsRedirect) || $lastRevIsRedirect !== $isRedirect) {
-
+ if($isRedirect || is_null($lastRevIsRedirect) || $lastRevIsRedirect !== $isRedirect) {
wfProfileIn( __METHOD__ );
-
- if ($isRedirect) {
-
+ if( $isRedirect ) {
// This title is a redirect, Add/Update row in the redirect table
$set = array( /* SET */
'rd_namespace' => $redirectTitle->getNamespace(),
'rd_title' => $redirectTitle->getDBkey(),
'rd_from' => $this->getId(),
);
-
$dbw->replace( 'redirect', array( 'rd_from' ), $set, __METHOD__ );
} else {
// This is not a redirect, remove row from redirect table
$where = array( 'rd_from' => $this->getId() );
$dbw->delete( 'redirect', $where, __METHOD__);
}
-
- if( $this->getTitle()->getNamespace() == NS_IMAGE )
+ if( $this->getTitle()->getNamespace() == NS_FILE ) {
RepoGroup::singleton()->getLocalRepo()->invalidateImageRedirect( $this->getTitle() );
+ }
wfProfileOut( __METHOD__ );
return ( $dbw->affectedRows() != 0 );
}
-
return true;
}
* 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
+ * @param $dbw Database object
+ * @param $revision Revision object
*/
- function updateIfNewerOn( &$dbw, $revision ) {
+ public function updateIfNewerOn( &$dbw, $revision ) {
wfProfileIn( __METHOD__ );
-
$row = $dbw->selectRow(
array( 'revision', 'page' ),
array( 'rev_id', 'rev_timestamp', 'page_is_redirect' ),
$prev = 0;
$lastRevIsRedirect = null;
}
-
$ret = $this->updateRevisionOn( $dbw, $revision, $prev, $lastRevIsRedirect );
wfProfileOut( __METHOD__ );
return $ret;
}
/**
+ * @param $section empty/null/false or a section number (0, 1, 2, T1, T2...)
* @return string Complete article text, or null if error
*/
- function replaceSection($section, $text, $summary = '', $edittime = NULL) {
+ public function replaceSection( $section, $text, $summary = '', $edittime = NULL ) {
wfProfileIn( __METHOD__ );
-
- if( $section == '' ) {
- // Whole-page edit; let the text through unmolested.
+ if( strval( $section ) == '' ) {
+ // Whole-page edit; let the whole text through
} else {
- if( is_null( $edittime ) ) {
+ if( is_null($edittime) ) {
$rev = Revision::newFromTitle( $this->mTitle );
} else {
$dbw = wfGetDB( DB_MASTER );
$rev = Revision::loadFromTimestamp( $dbw, $this->mTitle, $edittime );
}
- if( is_null( $rev ) ) {
+ if( !$rev ) {
wfDebug( "Article::replaceSection asked for bogus section (page: " .
$this->getId() . "; section: $section; edittime: $edittime)\n" );
return null;
global $wgParser;
$text = $wgParser->replaceSection( $oldtext, $section, $text );
}
-
}
-
wfProfileOut( __METHOD__ );
return $text;
}
* @deprecated use Article::doEdit()
*/
function insertNewArticle( $text, $summary, $isminor, $watchthis, $suppressRC=false, $comment=false, $bot=false ) {
+ wfDeprecated( __METHOD__ );
$flags = EDIT_NEW | EDIT_DEFER_UPDATES | EDIT_AUTOSUMMARY |
( $isminor ? EDIT_MINOR : 0 ) |
( $suppressRC ? EDIT_SUPPRESS_RC : 0 ) |
( $bot ? EDIT_FORCE_BOT : 0 );
# If this is a comment, add the summary as headline
- if ( $comment && $summary != "" ) {
+ if( $comment && $summary != "" ) {
$text = wfMsgForContent('newsectionheaderdefaultlevel',$summary) . "\n\n".$text;
}
$this->doEdit( $text, $summary, $flags );
$dbw = wfGetDB( DB_MASTER );
- if ($watchthis) {
- if (!$this->mTitle->userIsWatching()) {
+ if($watchthis) {
+ if(!$this->mTitle->userIsWatching()) {
$dbw->begin();
$this->doWatch();
$dbw->commit();
}
} else {
- if ( $this->mTitle->userIsWatching() ) {
+ if( $this->mTitle->userIsWatching() ) {
$dbw->begin();
$this->doUnwatch();
$dbw->commit();
* @deprecated use Article::doEdit()
*/
function updateArticle( $text, $summary, $minor, $watchthis, $forceBot = false, $sectionanchor = '' ) {
+ wfDeprecated( __METHOD__ );
$flags = EDIT_UPDATE | EDIT_DEFER_UPDATES | EDIT_AUTOSUMMARY |
( $minor ? EDIT_MINOR : 0 ) |
( $forceBot ? EDIT_FORCE_BOT : 0 );
$status = $this->doEdit( $text, $summary, $flags );
- if ( !$status->isOK() ) {
+ if( !$status->isOK() ) {
return false;
}
$dbw = wfGetDB( DB_MASTER );
- if ($watchthis) {
- if (!$this->mTitle->userIsWatching()) {
+ if( $watchthis ) {
+ if(!$this->mTitle->userIsWatching()) {
$dbw->begin();
$this->doWatch();
$dbw->commit();
}
} else {
- if ( $this->mTitle->userIsWatching() ) {
+ if( $this->mTitle->userIsWatching() ) {
$dbw->begin();
$this->doUnwatch();
$dbw->commit();
*
* $wgUser must be set before calling this function.
*
- * @param string $text New text
- * @param string $summary Edit summary
- * @param integer $flags bitfield:
+ * @param $text String: new text
+ * @param $summary String: edit summary
+ * @param $flags Integer bitfield:
* EDIT_NEW
* Article is known or assumed to be non-existent, create a new one
* EDIT_UPDATE
* edit-already-exists error will be returned. These two conditions are also possible with
* auto-detection due to MediaWiki's performance-optimised locking strategy.
*
- * @param $baseRevId, the revision ID this edit was based off, if any
+ * @param $baseRevId the revision ID this edit was based off, if any
+ * @param $user Optional user object, $wgUser will be used if not passed
*
* @return Status object. Possible errors:
* edit-hook-aborted: The ArticleSave hook aborted the edit but didn't set the fatal flag of $status
*
* Compatibility note: this function previously returned a boolean value indicating success/failure
*/
- function doEdit( $text, $summary, $flags = 0, $baseRevId = false, $user = null ) {
+ public function doEdit( $text, $summary, $flags = 0, $baseRevId = false, $user = null ) {
global $wgUser, $wgDBtransactions, $wgUseAutomaticEditSummaries;
# Low-level sanity check
wfProfileIn( __METHOD__ );
- if ($user == null) {
- $user = $wgUser;
- }
+ $user = is_null($user) ? $wgUser : $user;
$status = Status::newGood( array() );
# Load $this->mTitle->getArticleID() and $this->mLatest if it's not already
$this->loadPageData();
- if ( !($flags & EDIT_NEW) && !($flags & EDIT_UPDATE) ) {
+ if( !($flags & EDIT_NEW) && !($flags & EDIT_UPDATE) ) {
$aid = $this->mTitle->getArticleID();
- if ( $aid ) {
+ if( $aid ) {
$flags |= EDIT_UPDATE;
} else {
$flags |= EDIT_NEW;
}
}
- if( !wfRunHooks( 'ArticleSave', array( &$this, &$user, &$text,
- &$summary, $flags & EDIT_MINOR,
- null, null, &$flags, &$status ) ) )
+ if( !wfRunHooks( 'ArticleSave', array( &$this, &$user, &$text, &$summary,
+ $flags & EDIT_MINOR, null, null, &$flags, &$status ) ) )
{
wfDebug( __METHOD__ . ": ArticleSave hook aborted save!\n" );
wfProfileOut( __METHOD__ );
- if ( $status->isOK() ) {
+ if( $status->isOK() ) {
$status->fatal( 'edit-hook-aborted');
}
return $status;
$isminor = ( $flags & EDIT_MINOR ) && $user->isAllowed('minoredit');
$bot = $flags & EDIT_FORCE_BOT;
- $oldtext = $this->getContent();
+ $oldtext = $this->getRawText(); // current revision
$oldsize = strlen( $oldtext );
# Provide autosummaries if one is not provided and autosummaries are enabled.
$dbw = wfGetDB( DB_MASTER );
$now = wfTimestampNow();
- if ( $flags & EDIT_UPDATE ) {
+ if( $flags & EDIT_UPDATE ) {
# Update article, but only if changed.
$status->value['new'] = false;
-
# Make sure the revision is either completely inserted or not inserted at all
if( !$wgDBtransactions ) {
$userAbort = ignore_user_abort( true );
$changed = ( strcmp( $text, $oldtext ) != 0 );
- if ( $changed ) {
+ if( $changed ) {
$this->mGoodAdjustment = (int)$this->isCountable( $text )
- (int)$this->isCountable( $oldtext );
$this->mTotalAdjustment = 0;
- if ( !$this->mLatest ) {
+ if( !$this->mLatest ) {
# Article gone missing
wfDebug( __METHOD__.": EDIT_UPDATE specified but article doesn't exist\n" );
$status->fatal( 'edit-gone-missing' );
/* Belated edit conflict! Run away!! */
$status->fatal( 'edit-conflict' );
# Delete the invalid revision if the DB is not transactional
- if ( !$wgDBtransactions ) {
+ if( !$wgDBtransactions ) {
$dbw->delete( 'revision', array( 'rev_id' => $revisionId ), __METHOD__ );
}
$revisionId = 0;
$dbw->rollback();
} else {
- wfRunHooks( 'NewRevisionFromEditComplete', array( $this, $revision, $baseRevId ) );
-
+ global $wgUseRCPatrol;
+ wfRunHooks( 'NewRevisionFromEditComplete', array($this, $revision, $baseRevId, $user) );
# Update recentchanges
if( !( $flags & EDIT_SUPPRESS_RC ) ) {
+ # Mark as patrolled if the user can do so
+ $patrolled = $wgUseRCPatrol && $this->mTitle->userCan('autopatrol');
+ # Add RC row to the DB
$rc = RecentChange::notifyEdit( $now, $this->mTitle, $isminor, $user, $summary,
$this->mLatest, $this->getTimestamp(), $bot, '', $oldsize, $newsize,
- $revisionId );
-
- # Mark as patrolled if the user can do so
- if( $GLOBALS['wgUseRCPatrol'] && $user->isAllowed( 'autopatrol' ) ) {
- RecentChange::markPatrolled( $rc, true );
+ $revisionId, $patrolled
+ );
+ # Log auto-patrolled edits
+ if( $patrolled ) {
+ PatrolLog::record( $rc, true );
}
}
$user->incEditCount();
ignore_user_abort( $userAbort );
}
// Now that ignore_user_abort is restored, we can respond to fatal errors
- if ( !$status->isOK() ) {
+ if( !$status->isOK() ) {
wfProfileOut( __METHOD__ );
return $status;
}
# Invalidate cache of this article and all pages using this article
- # as a template. Partly deferred.
- Article::onArticleEdit( $this->mTitle, false ); // leave templatelinks for editUpdates()
+ # as a template. Partly deferred. Leave templatelinks for editUpdates().
+ Article::onArticleEdit( $this->mTitle, 'skiptransclusions' );
# Update links tables, site stats, etc.
$this->editUpdates( $text, $summary, $isminor, $now, $revisionId, $changed );
} else {
# This will return false if the article already exists
$newid = $this->insertOn( $dbw );
- if ( $newid === false ) {
+ if( $newid === false ) {
$dbw->rollback();
$status->fatal( 'edit-already-exists' );
wfProfileOut( __METHOD__ );
# Update the page record with revision data
$this->updateRevisionOn( $dbw, $revision, 0 );
- wfRunHooks( 'NewRevisionFromEditComplete', array($this, $revision, false) );
-
+ wfRunHooks( 'NewRevisionFromEditComplete', array($this, $revision, false, $user) );
+ # Update recentchanges
if( !( $flags & EDIT_SUPPRESS_RC ) ) {
+ global $wgUseRCPatrol, $wgUseNPPatrol;
+ # Mark as patrolled if the user can do so
+ $patrolled = ($wgUseRCPatrol || $wgUseNPPatrol) && $this->mTitle->userCan('autopatrol');
+ # Add RC row to the DB
$rc = RecentChange::notifyNew( $now, $this->mTitle, $isminor, $user, $summary, $bot,
- '', strlen( $text ), $revisionId );
- # Mark as patrolled if the user can
- if( ($GLOBALS['wgUseRCPatrol'] || $GLOBALS['wgUseNPPatrol']) && $user->isAllowed( 'autopatrol' ) ) {
- RecentChange::markPatrolled( $rc, true );
+ '', strlen($text), $revisionId, $patrolled );
+ # Log auto-patrolled edits
+ if( $patrolled ) {
+ PatrolLog::record( $rc, true );
}
}
$user->incEditCount();
}
# Do updates right now unless deferral was requested
- if ( !( $flags & EDIT_DEFER_UPDATES ) ) {
+ if( !( $flags & EDIT_DEFER_UPDATES ) ) {
wfDoUpdates();
}
/**
* @deprecated wrapper for doRedirect
*/
- function showArticle( $text, $subtitle , $sectionanchor = '', $me2, $now, $summary, $oldid ) {
+ public function showArticle( $text, $subtitle , $sectionanchor = '', $me2, $now, $summary, $oldid ) {
+ wfDeprecated( __METHOD__ );
$this->doRedirect( $this->isRedirect( $text ), $sectionanchor );
}
* Output a redirect back to the article.
* This is typically used after an edit.
*
- * @param boolean $noRedir Add redirect=no
- * @param string $sectionAnchor section to redirect to, including "#"
- * @param string $extraQuery, extra query params
+ * @param $noRedir Boolean: add redirect=no
+ * @param $sectionAnchor String: section to redirect to, including "#"
+ * @param $extraQuery String: extra query params
*/
- function doRedirect( $noRedir = false, $sectionAnchor = '', $extraQuery = '' ) {
+ public function doRedirect( $noRedir = false, $sectionAnchor = '', $extraQuery = '' ) {
global $wgOut;
- if ( $noRedir ) {
+ if( $noRedir ) {
$query = 'redirect=no';
if( $extraQuery )
$query .= "&$query";
/**
* Mark this particular edit/page as patrolled
*/
- function markpatrolled() {
+ public function markpatrolled() {
global $wgOut, $wgRequest, $wgUseRCPatrol, $wgUseNPPatrol, $wgUser;
$wgOut->setRobotPolicy( 'noindex,nofollow' );
# If we haven't been given an rc_id value, we can't do anything
$rcid = (int) $wgRequest->getVal('rcid');
$rc = RecentChange::newFromId($rcid);
- if ( is_null($rc) ) {
+ if( is_null($rc) ) {
$wgOut->showErrorPage( 'markedaspatrollederror', 'markedaspatrollederrortext' );
return;
}
#It would be nice to see where the user had actually come from, but for now just guess
- $returnto = $rc->getAttribute( 'rc_type' ) == RC_NEW ? 'Newpages' : 'Recentchanges';
- $return = Title::makeTitle( NS_SPECIAL, $returnto );
+ $returnto = $rc->getAttribute( 'rc_type' ) == RC_NEW ? 'newpages' : 'recentchanges';
+ $return = SpecialPage::getTitleFor( $returnto );
$dbw = wfGetDB( DB_MASTER );
$errors = $rc->doMarkPatrolled();
- if ( in_array(array('rcpatroldisabled'), $errors) ) {
+ if( in_array(array('rcpatroldisabled'), $errors) ) {
$wgOut->showErrorPage( 'rcpatroldisabled', 'rcpatroldisabledtext' );
return;
}
- if ( in_array(array('hookaborted'), $errors) ) {
+ if( in_array(array('hookaborted'), $errors) ) {
// The hook itself has handled any output
return;
}
- if ( in_array(array('markedaspatrollederror-noautopatrol'), $errors) ) {
+ if( in_array(array('markedaspatrollederror-noautopatrol'), $errors) ) {
$wgOut->setPageTitle( wfMsg( 'markedaspatrollederror' ) );
$wgOut->addWikiMsg( 'markedaspatrollederror-noautopatrol' );
$wgOut->returnToMain( false, $return );
return;
}
- if ( !empty($errors) ) {
+ if( !empty($errors) ) {
$wgOut->showPermissionsErrorPage( $errors );
return;
}
* User-interface handler for the "watch" action
*/
- function watch() {
-
+ public function watch() {
global $wgUser, $wgOut;
-
- if ( $wgUser->isAnon() ) {
+ if( $wgUser->isAnon() ) {
$wgOut->showErrorPage( 'watchnologin', 'watchnologintext' );
return;
}
- if ( wfReadOnly() ) {
+ if( wfReadOnly() ) {
$wgOut->readOnlyPage();
return;
}
-
if( $this->doWatch() ) {
$wgOut->setPagetitle( wfMsg( 'addedwatch' ) );
$wgOut->setRobotPolicy( 'noindex,nofollow' );
-
$wgOut->addWikiMsg( 'addedwatchtext', $this->mTitle->getPrefixedText() );
}
-
$wgOut->returnToMain( true, $this->mTitle->getPrefixedText() );
}
* Add this page to $wgUser's watchlist
* @return bool true on successful watch operation
*/
- function doWatch() {
+ public function doWatch() {
global $wgUser;
if( $wgUser->isAnon() ) {
return false;
}
-
- if (wfRunHooks('WatchArticle', array(&$wgUser, &$this))) {
+ if( wfRunHooks('WatchArticle', array(&$wgUser, &$this)) ) {
$wgUser->addWatch( $this->mTitle );
-
return wfRunHooks('WatchArticleComplete', array(&$wgUser, &$this));
}
-
return false;
}
/**
* User interface handler for the "unwatch" action.
*/
- function unwatch() {
-
+ public function unwatch() {
global $wgUser, $wgOut;
-
- if ( $wgUser->isAnon() ) {
+ if( $wgUser->isAnon() ) {
$wgOut->showErrorPage( 'watchnologin', 'watchnologintext' );
return;
}
- if ( wfReadOnly() ) {
+ if( wfReadOnly() ) {
$wgOut->readOnlyPage();
return;
}
-
if( $this->doUnwatch() ) {
$wgOut->setPagetitle( wfMsg( 'removedwatch' ) );
$wgOut->setRobotPolicy( 'noindex,nofollow' );
-
$wgOut->addWikiMsg( 'removedwatchtext', $this->mTitle->getPrefixedText() );
}
-
$wgOut->returnToMain( true, $this->mTitle->getPrefixedText() );
}
* Stop watching a page
* @return bool true on successful unwatch
*/
- function doUnwatch() {
+ public function doUnwatch() {
global $wgUser;
if( $wgUser->isAnon() ) {
return false;
}
-
- if (wfRunHooks('UnwatchArticle', array(&$wgUser, &$this))) {
+ if( wfRunHooks('UnwatchArticle', array(&$wgUser, &$this)) ) {
$wgUser->removeWatch( $this->mTitle );
-
return wfRunHooks('UnwatchArticleComplete', array(&$wgUser, &$this));
}
-
return false;
}
/**
* action=protect handler
*/
- function protect() {
+ public function protect() {
$form = new ProtectionForm( $this );
$form->execute();
}
/**
* action=unprotect handler (alias)
*/
- function unprotect() {
+ public function unprotect() {
$this->protect();
}
/**
* Update the article's restriction field, and leave a log entry.
*
- * @param array $limit set of restriction keys
- * @param string $reason
+ * @param $limit Array: set of restriction keys
+ * @param $reason String
+ * @param &$cascade Integer. Set to false if cascading protection isn't allowed.
+ * @param $expiry Array: per restriction type expiration
* @return bool true on success
*/
- function updateRestrictions( $limit = array(), $reason = '', $cascade = 0, $expiry = array() ) {
+ public function updateRestrictions( $limit = array(), $reason = '', &$cascade = 0, $expiry = array() ) {
global $wgUser, $wgRestrictionTypes, $wgContLang;
$id = $this->mTitle->getArticleID();
- if( array() != $this->mTitle->getUserPermissionsErrors( 'protect', $wgUser ) || wfReadOnly() || $id == 0 ) {
+ if( $id <= 0 || wfReadOnly() || !$this->mTitle->userCan('protect') ) {
return false;
}
$updated = Article::flattenRestrictions( $limit );
$changed = false;
foreach( $wgRestrictionTypes as $action ) {
- $current[$action] = implode( '', $this->mTitle->getRestrictions( $action ) );
- $changed = ($changed || ($this->mTitle->mRestrictionsExpiry[$action] != $expiry[$action]) );
+ if( isset( $expiry[$action] ) ) {
+ # Get current restrictions on $action
+ $aLimits = $this->mTitle->getRestrictions( $action );
+ $current[$action] = implode( '', $aLimits );
+ # Are any actual restrictions being dealt with here?
+ $aRChanged = count($aLimits) || !empty($limit[$action]);
+ # If something changed, we need to log it. Checking $aRChanged
+ # assures that "unprotecting" a page that is not protected does
+ # not log just because the expiry was "changed".
+ if( $aRChanged && $this->mTitle->mRestrictionsExpiry[$action] != $expiry[$action] ) {
+ $changed = true;
+ }
+ }
}
$current = Article::flattenRestrictions( $current );
- $changed = ($changed || ( $current != $updated ) );
+ $changed = ($changed || $current != $updated );
$changed = $changed || ($updated && $this->mTitle->areRestrictionsCascading() != $cascade);
$protect = ( $updated != '' );
# Only restrictions with the 'protect' right can cascade...
# Otherwise, people who cannot normally protect can "protect" pages via transclusion
- foreach( $limit as $action => $restriction ) {
- # FIXME: can $restriction be an array or what? (same as fixme above)
- if( $restriction != 'protect' && $restriction != 'sysop' ) {
- $cascade = false;
- break;
- }
- }
+ $editrestriction = isset( $limit['edit'] ) ? array( $limit['edit'] ) : $this->mTitle->getRestrictions( 'edit' );
+ # The schema allows multiple restrictions
+ if(!in_array('protect', $editrestriction) && !in_array('sysop', $editrestriction))
+ $cascade = false;
$cascade_description = '';
if( $cascade ) {
$cascade_description = ' ['.wfMsgForContent('protect-summary-cascade').']';
$protect_description .= "[$action=$restrictions] (";
if( $encodedExpiry[$action] != 'infinity' ) {
$protect_description .= wfMsgForContent( 'protect-expiring',
- $wgContLang->timeanddate( $expiry[$action], false, false ) );
+ $wgContLang->timeanddate( $expiry[$action], false, false ) ,
+ $wgContLang->date( $expiry[$action], false, false ) ,
+ $wgContLang->time( $expiry[$action], false, false ) );
} else {
$protect_description .= wfMsgForContent( 'protect-expiry-indefinite' );
}
$editComment .= "$cascade_description";
# Update restrictions table
foreach( $limit as $action => $restrictions ) {
- if ($restrictions != '' ) {
+ if($restrictions != '' ) {
$dbw->replace( 'page_restrictions', array(array('pr_page', 'pr_type')),
array( 'pr_page' => $id,
'pr_type' => $action,
), 'Article::protect'
);
- wfRunHooks( 'NewRevisionFromEditComplete', array($this, $nullRevision, $latest) );
+ wfRunHooks( 'NewRevisionFromEditComplete', array($this, $nullRevision, $latest, $wgUser) );
wfRunHooks( 'ArticleProtectComplete', array( &$this, &$wgUser, $limit, $reason ) );
# Update the protection log
/**
* Take an array of page restrictions and flatten it to a string
* suitable for insertion into the page_restrictions field.
- * @param array $limit
- * @return string
- * @private
+ * @param $limit Array
+ * @return String
*/
- function flattenRestrictions( $limit ) {
+ protected static function flattenRestrictions( $limit ) {
if( !is_array( $limit ) ) {
throw new MWException( 'Article::flattenRestrictions given non-array restriction set' );
}
/**
* Auto-generates a deletion reason
- * @param bool &$hasHistory Whether the page has a history
+ * @param &$hasHistory Boolean: whether the page has a history
*/
public function generateReason( &$hasHistory ) {
global $wgContLang;
else
$reason = wfMsgForContent( 'excontent', '$1' );
}
+
+ if( $reason == '-' ) {
+ // Allow these UI messages to be blanked out cleanly
+ return '';
+ }
// Replace newlines with spaces to prevent uglyness
$contents = preg_replace( "/[\n\r]/", ' ', $contents );
/*
* UI entry point for page deletion
*/
- function delete() {
+ public function delete() {
global $wgUser, $wgOut, $wgRequest;
$confirm = $wgRequest->wasPosted() &&
$reason = $this->DeleteReasonList;
- if ( $reason != 'other' && $this->DeleteReason != '') {
+ if( $reason != 'other' && $this->DeleteReason != '' ) {
// Entry from drop down menu + additional comment
- $reason .= ': ' . $this->DeleteReason;
- } elseif ( $reason == 'other' ) {
+ $reason .= wfMsgForContent( 'colon-separator' ) . $this->DeleteReason;
+ } elseif( $reason == 'other' ) {
$reason = $this->DeleteReason;
}
# Flag to hide all contents of the archived revisions
- $suppress = $wgRequest->getVal( 'wpSuppress' ) && $wgUser->isAllowed('suppressrevision');
+ $suppress = $wgRequest->getVal( 'wpSuppress' ) && $wgUser->isAllowed( 'suppressrevision' );
# This code desperately needs to be totally rewritten
# Read-only check...
- if ( wfReadOnly() ) {
+ if( wfReadOnly() ) {
$wgOut->readOnlyPage();
return;
}
# Check permissions
$permission_errors = $this->mTitle->getUserPermissionsErrors( 'delete', $wgUser );
- if (count($permission_errors)>0) {
+ if( count( $permission_errors ) > 0 ) {
$wgOut->showPermissionsErrorPage( $permission_errors );
return;
}
$dbw = wfGetDB( DB_MASTER );
$conds = $this->mTitle->pageCond();
$latest = $dbw->selectField( 'page', 'page_latest', $conds, __METHOD__ );
- if ( $latest === false ) {
- $wgOut->showFatalError( wfMsg( 'cannotdelete' ) );
+ if( $latest === false ) {
+ $wgOut->showFatalError( wfMsgExt( 'cannotdelete', array( 'parse' ) ) );
+ $wgOut->addHTML( Xml::element( 'h2', null, LogPage::logName( 'delete' ) ) );
+ LogEventsList::showLogExtract( $wgOut, 'delete', $this->mTitle->getPrefixedText() );
return;
}
// Generate deletion reason
$hasHistory = false;
- if ( !$reason ) $reason = $this->generateReason($hasHistory);
+ if( !$reason ) $reason = $this->generateReason($hasHistory);
// If the page has a history, insert a warning
if( $hasHistory && !$confirm ) {
- $skin=$wgUser->getSkin();
- $wgOut->addHTML( '<strong>' . wfMsg( 'historywarning' ) . ' ' . $skin->historyLink() . '</strong>' );
+ $skin = $wgUser->getSkin();
+ $wgOut->addHTML( '<strong>' . wfMsgExt( 'historywarning', array( 'parseinline' ) ) . ' ' . $skin->historyLink() . '</strong>' );
if( $bigHistory ) {
global $wgLang, $wgDeleteRevisionsLimit;
$wgOut->wrapWikiMsg( "<div class='error'>\n$1</div>\n",
/**
* @return bool whether or not the page surpasses $wgDeleteRevisionsLimit revisions
*/
- function isBigDeletion() {
+ public function isBigDeletion() {
global $wgDeleteRevisionsLimit;
if( $wgDeleteRevisionsLimit ) {
$revCount = $this->estimateRevisionCount();
/**
* @return int approximate revision count
*/
- function estimateRevisionCount() {
+ public function estimateRevisionCount() {
$dbr = wfGetDB( DB_SLAVE );
// For an exact count...
//return $dbr->selectField( 'revision', 'COUNT(*)',
/**
* 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)
+ * @param $num Integer: number of revisions to get
+ * @param $revLatest String: the latest rev_id, selected from the master (optional)
* @return array Array of authors, duplicates not removed
*/
- function getLastNAuthors( $num, $revLatest = 0 ) {
+ public function getLastNAuthors( $num, $revLatest = 0 ) {
wfProfileIn( __METHOD__ );
-
// First try the slave
// If that doesn't have the latest revision, try the master
$continue = 2;
'LIMIT' => $num
) )
);
- if ( !$res ) {
+ if( !$res ) {
wfProfileOut( __METHOD__ );
return array();
}
$row = $db->fetchObject( $res );
- if ( $continue == 2 && $revLatest && $row->rev_id != $revLatest ) {
+ if( $continue == 2 && $revLatest && $row->rev_id != $revLatest ) {
$db = wfGetDB( DB_MASTER );
$continue--;
} else {
/**
* Output deletion confirmation dialog
- * @param $reason string Prefilled reason
+ * @param $reason String: prefilled reason
*/
- function confirmDelete( $reason ) {
- global $wgOut, $wgUser, $wgContLang;
- $align = $wgContLang->isRtl() ? 'left' : 'right';
+ public function confirmDelete( $reason ) {
+ global $wgOut, $wgUser;
wfDebug( "Article::confirmDelete\n" );
- $wgOut->setSubtitle( wfMsg( 'delete-backlink', $wgUser->getSkin()->makeKnownLinkObj( $this->mTitle ) ) );
+ $wgOut->setSubtitle( wfMsgHtml( 'delete-backlink', $wgUser->getSkin()->makeKnownLinkObj( $this->mTitle ) ) );
$wgOut->setRobotPolicy( 'noindex,nofollow' );
$wgOut->addWikiMsg( 'confirmdeletetext' );
if( $wgUser->isAllowed( 'suppressrevision' ) ) {
- $suppress = "<tr id=\"wpDeleteSuppressRow\" name=\"wpDeleteSuppressRow\"><td></td><td>";
- $suppress .= Xml::checkLabel( wfMsg( 'revdelete-suppress' ), 'wpSuppress', 'wpSuppress', false, array( 'tabindex' => '2' ) );
- $suppress .= "</td></tr>";
+ $suppress = "<tr id=\"wpDeleteSuppressRow\" name=\"wpDeleteSuppressRow\">
+ <td></td>
+ <td class='mw-input'>" .
+ Xml::checkLabel( wfMsg( 'revdelete-suppress' ),
+ 'wpSuppress', 'wpSuppress', false, array( 'tabindex' => '4' ) ) .
+ "</td>
+ </tr>";
} else {
$suppress = '';
}
'action' => $this->mTitle->getLocalURL( 'action=delete' ), 'id' => 'deleteconfirm' ) ) .
Xml::openElement( 'fieldset', array( 'id' => 'mw-delete-table' ) ) .
Xml::tags( 'legend', null, wfMsgExt( 'delete-legend', array( 'parsemag', 'escapenoentities' ) ) ) .
- Xml::openElement( 'table' ) .
+ Xml::openElement( 'table', array( 'id' => 'mw-deleteconfirm-table' ) ) .
"<tr id=\"wpDeleteReasonListRow\">
- <td align='$align'>" .
+ <td class='mw-label'>" .
Xml::label( wfMsg( 'deletecomment' ), 'wpDeleteReasonList' ) .
"</td>
- <td>" .
+ <td class='mw-input'>" .
Xml::listDropDown( 'wpDeleteReasonList',
wfMsgForContent( 'deletereason-dropdown' ),
wfMsgForContent( 'deletereasonotherlist' ), '', 'wpReasonDropDown', 1 ) .
"</td>
</tr>
<tr id=\"wpDeleteReasonRow\">
- <td align='$align'>" .
+ <td class='mw-label'>" .
Xml::label( wfMsg( 'deleteotherreason' ), 'wpReason' ) .
"</td>
- <td>" .
+ <td class='mw-input'>" .
Xml::input( 'wpReason', 60, $reason, array( 'type' => 'text', 'maxlength' => '255',
'tabindex' => '2', 'id' => 'wpReason' ) ) .
"</td>
</tr>
<tr>
<td></td>
- <td>" .
- Xml::checkLabel( wfMsg( 'watchthis' ), 'wpWatch', 'wpWatch', $checkWatch, array( 'tabindex' => '3' ) ) .
+ <td class='mw-input'>" .
+ Xml::checkLabel( wfMsg( 'watchthis' ),
+ 'wpWatch', 'wpWatch', $checkWatch, array( 'tabindex' => '3' ) ) .
"</td>
</tr>
$suppress
<tr>
<td></td>
- <td>" .
- Xml::submitButton( wfMsg( 'deletepage' ), array( 'name' => 'wpConfirmB', 'id' => 'wpConfirmB', 'tabindex' => '4' ) ) .
+ <td class='mw-submit'>" .
+ Xml::submitButton( wfMsg( 'deletepage' ),
+ array( 'name' => 'wpConfirmB', 'id' => 'wpConfirmB', 'tabindex' => '5' ) ) .
"</td>
</tr>" .
Xml::closeElement( 'table' ) .
Xml::hidden( 'wpEditToken', $wgUser->editToken() ) .
Xml::closeElement( 'form' );
- if ( $wgUser->isAllowed( 'editinterface' ) ) {
+ if( $wgUser->isAllowed( 'editinterface' ) ) {
$skin = $wgUser->getSkin();
$link = $skin->makeLink ( 'MediaWiki:Deletereason-dropdown', wfMsgHtml( 'delete-edit-reasonlist' ) );
$form .= '<p class="mw-delete-editreasons">' . $link . '</p>';
}
$wgOut->addHTML( $form );
- $this->showLogExtract( $wgOut );
+ LogEventsList::showLogExtract( $wgOut, 'delete', $this->mTitle->getPrefixedText() );
}
-
- /**
- * Show relevant lines from the deletion log
- */
- function showLogExtract( $out ) {
- $out->addHtml( Xml::element( 'h2', null, LogPage::logName( 'delete' ) ) );
- LogEventsList::showLogExtract( $out, 'delete', $this->mTitle->getPrefixedText() );
- }
-
-
/**
* Perform a deletion and output success or failure messages
*/
- function doDelete( $reason, $suppress = false ) {
+ public function doDelete( $reason, $suppress = false ) {
global $wgOut, $wgUser;
- wfDebug( __METHOD__."\n" );
-
$id = $this->mTitle->getArticleID( GAID_FOR_UPDATE );
$error = '';
-
- if ( wfRunHooks('ArticleDelete', array(&$this, &$wgUser, &$reason, &$error)) ) {
- if ( $this->doDeleteArticle( $reason, $suppress, $id ) ) {
+ if( wfRunHooks('ArticleDelete', array(&$this, &$wgUser, &$reason, &$error)) ) {
+ if( $this->doDeleteArticle( $reason, $suppress, $id ) ) {
$deleted = $this->mTitle->getPrefixedText();
$wgOut->setPagetitle( wfMsg( 'actioncomplete' ) );
$wgOut->returnToMain( false );
wfRunHooks('ArticleDeleteComplete', array(&$this, &$wgUser, $reason, $id));
} else {
- if ($error = '')
- $wgOut->showFatalError( wfMsg( 'cannotdelete' ) );
- else
+ if( $error == '' ) {
+ $wgOut->showFatalError( wfMsgExt( 'cannotdelete', array( 'parse' ) ) );
+ $wgOut->addHTML( Xml::element( 'h2', null, LogPage::logName( 'delete' ) ) );
+ LogEventsList::showLogExtract( $wgOut, 'delete', $this->mTitle->getPrefixedText() );
+ } else {
$wgOut->showFatalError( $error );
+ }
}
}
}
* Deletes the article with database consistency, writes logs, purges caches
* Returns success
*/
- function doDeleteArticle( $reason, $suppress = false, $id = 0 ) {
+ public function doDeleteArticle( $reason, $suppress = false, $id = 0 ) {
global $wgUseSquid, $wgDeferredUpdateList;
global $wgUseTrackbacks;
$t = $this->mTitle->getDBkey();
$id = $id ? $id : $this->mTitle->getArticleID( GAID_FOR_UPDATE );
- if ( $t == '' || $id == 0 ) {
+ if( $t == '' || $id == 0 ) {
return false;
}
- $u = new SiteStatsUpdate( 0, 1, -(int)$this->isCountable( $this->getContent() ), -1 );
+ $u = new SiteStatsUpdate( 0, 1, -(int)$this->isCountable( $this->getRawText() ), -1 );
array_push( $wgDeferredUpdateList, $u );
// Bitfields to further suppress the content
- if ( $suppress ) {
+ if( $suppress ) {
$bitfield = 0;
// This should be 15...
$bitfield |= Revision::DELETED_TEXT;
}
# If using cascading deletes, we can skip some explicit deletes
- if ( !$dbw->cascadingDeletes() ) {
+ if( !$dbw->cascadingDeletes() ) {
$dbw->delete( 'revision', array( 'rev_page' => $id ), __METHOD__ );
- if ($wgUseTrackbacks)
+ if($wgUseTrackbacks)
$dbw->delete( 'trackbacks', array( 'tb_page' => $id ), __METHOD__ );
# Delete outgoing links
}
# If using cleanup triggers, we can skip some manual deletes
- if ( !$dbw->cleanupTriggers() ) {
+ if( !$dbw->cleanupTriggers() ) {
# Clean up recentchanges entries...
+ $dbw->delete( 'recentchanges',
+ array( 'rc_type != '.RC_LOG,
+ 'rc_namespace' => $this->mTitle->getNamespace(),
+ 'rc_title' => $this->mTitle->getDBKey() ),
+ __METHOD__ );
$dbw->delete( 'recentchanges',
array( 'rc_type != '.RC_LOG, 'rc_cur_id' => $id ),
__METHOD__ );
* performs permissions checks on $wgUser, then calls commitRollback()
* to do the dirty work
*
- * @param string $fromP - Name of the user whose edits to rollback.
- * @param string $summary - Custom summary. Set to default summary if empty.
- * @param string $token - Rollback token.
- * @param bool $bot - If true, mark all reverted edits as bot.
+ * @param $fromP String: Name of the user whose edits to rollback.
+ * @param $summary String: Custom summary. Set to default summary if empty.
+ * @param $token String: Rollback token.
+ * @param $bot Boolean: If true, mark all reverted edits as bot.
*
- * @param array $resultDetails contains result-specific array of additional values
+ * @param $resultDetails Array: contains result-specific array of additional values
* 'alreadyrolled' : 'current' (rev)
* success : 'summary' (str), 'current' (rev), 'target' (rev)
*
$resultDetails = null;
# Check permissions
- $errors = array_merge( $this->mTitle->getUserPermissionsErrors( 'edit', $wgUser ),
- $this->mTitle->getUserPermissionsErrors( 'rollback', $wgUser ) );
+ $editErrors = $this->mTitle->getUserPermissionsErrors( 'edit', $wgUser );
+ $rollbackErrors = $this->mTitle->getUserPermissionsErrors( 'rollback', $wgUser );
+ $errors = array_merge( $editErrors, wfArrayDiff2( $rollbackErrors, $editErrors ) );
+
if( !$wgUser->matchEditToken( $token, array( $this->mTitle->getPrefixedText(), $fromP ) ) )
$errors[] = array( 'sessionfailure' );
- if ( $wgUser->pingLimiter('rollback') || $wgUser->pingLimiter() ) {
+ if( $wgUser->pingLimiter( 'rollback' ) || $wgUser->pingLimiter() ) {
$errors[] = array( 'actionthrottledtext' );
}
# If there were errors, bail out now
- if(!empty($errors))
+ if( !empty( $errors ) )
return $errors;
return $this->commitRollback($fromP, $summary, $bot, $resultDetails);
$s = $dbw->selectRow( 'revision',
array( 'rev_id', 'rev_timestamp', 'rev_deleted' ),
array( 'rev_page' => $current->getPage(),
- "rev_user <> {$user} OR rev_user_text <> {$user_text}"
+ "rev_user != {$user} OR rev_user_text != {$user_text}"
), __METHOD__,
array( 'USE INDEX' => 'page_timestamp',
'ORDER BY' => 'rev_timestamp DESC' )
}
$set = array();
- if ( $bot && $wgUser->isAllowed('markbotedits') ) {
+ if( $bot && $wgUser->isAllowed('markbotedits') ) {
# Mark all reverted edits as bot
$set['rc_bot'] = 1;
}
- if ( $wgUseRCPatrol ) {
+ if( $wgUseRCPatrol ) {
# Mark all reverted edits as patrolled
$set['rc_patrolled'] = 1;
}
- if ( $set ) {
+ if( $set ) {
$dbw->update( 'recentchanges', $set,
array( /* WHERE */
'rc_cur_id' => $current->getPage(),
$flags |= EDIT_FORCE_BOT;
# Actually store the edit
$status = $this->doEdit( $target->getText(), $summary, $flags, $target->getId() );
- if ( !empty( $status->value['revision'] ) ) {
+ if( !empty( $status->value['revision'] ) ) {
$revId = $status->value['revision']->getId();
} else {
$revId = false;
}
- wfRunHooks( 'ArticleRollbackComplete', array( $this, $wgUser, $target ) );
+ wfRunHooks( 'ArticleRollbackComplete', array( $this, $wgUser, $target, $current ) );
$resultDetails = array(
'summary' => $summary,
/**
* User interface for rollback operations
*/
- function rollback() {
+ public function rollback() {
global $wgUser, $wgOut, $wgRequest, $wgUseRCPatrol;
$details = null;
$details
);
- if( in_array( array( 'blocked' ), $result ) ) {
- $wgOut->blockedPage();
- return;
- }
if( in_array( array( 'actionthrottledtext' ), $result ) ) {
$wgOut->rateLimited();
return;
# Display permissions errors before read-only message -- there's no
# point in misleading the user into thinking the inability to rollback
# is only temporary.
- if( !empty($result) && $result !== array( array('readonlytext') ) ) {
+ if( !empty( $result ) && $result !== array( array( 'readonlytext' ) ) ) {
# array_diff is completely broken for arrays of arrays, sigh. Re-
# move any 'readonlytext' error manually.
$out = array();
$wgOut->showPermissionsErrorPage( $out );
return;
}
- if( $result == array( array('readonlytext') ) ) {
+ if( $result == array( array( 'readonlytext' ) ) ) {
$wgOut->readOnlyPage();
return;
}
. $wgUser->getSkin()->userToolLinks( $current->getUser(), $current->getUserText() );
$new = $wgUser->getSkin()->userLink( $target->getUser(), $target->getUserText() )
. $wgUser->getSkin()->userToolLinks( $target->getUser(), $target->getUserText() );
- $wgOut->addHtml( wfMsgExt( 'rollback-success', array( 'parse', 'replaceafter' ), $old, $new ) );
+ $wgOut->addHTML( wfMsgExt( 'rollback-success', array( 'parse', 'replaceafter' ), $old, $new ) );
$wgOut->returnToMain( false, $this->mTitle );
- if( !$wgRequest->getBool( 'hidediff', false ) ) {
+ if( !$wgRequest->getBool( 'hidediff', false ) && !$wgUser->getBoolOption( 'norollbackdiff', false ) ) {
$de = new DifferenceEngine( $this->mTitle, $current->getId(), $newId, false, true );
$de->showDiff( '', '' );
}
/**
* Do standard deferred updates after page view
- * @private
*/
- function viewUpdates() {
- global $wgDeferredUpdateList, $wgUser;
-
- if ( 0 != $this->getID() ) {
- # Don't update page view counters on views from bot users (bug 14044)
- global $wgDisableCounters;
- if( !$wgDisableCounters && !$wgUser->isAllowed( 'bot' ) ) {
- Article::incViewCount( $this->getID() );
- $u = new SiteStatsUpdate( 1, 0, 0 );
- array_push( $wgDeferredUpdateList, $u );
- }
+ public function viewUpdates() {
+ global $wgDeferredUpdateList, $wgDisableCounters, $wgUser;
+ # Don't update page view counters on views from bot users (bug 14044)
+ if( !$wgDisableCounters && !$wgUser->isAllowed('bot') && $this->getID() ) {
+ Article::incViewCount( $this->getID() );
+ $u = new SiteStatsUpdate( 1, 0, 0 );
+ array_push( $wgDeferredUpdateList, $u );
}
-
# Update newtalk / watchlist notification status
$wgUser->clearNotification( $this->mTitle );
}
* Prepare text which is about to be saved.
* Returns a stdclass with source, pst and output members
*/
- function prepareTextForEdit( $text, $revid=null ) {
- if ( $this->mPreparedEdit && $this->mPreparedEdit->newText == $text && $this->mPreparedEdit->revid == $revid) {
+ public function prepareTextForEdit( $text, $revid=null ) {
+ if( $this->mPreparedEdit && $this->mPreparedEdit->newText == $text && $this->mPreparedEdit->revid == $revid) {
// Already prepared
return $this->mPreparedEdit;
}
* @param $newid rev_id value of the new revision
* @param $changed Whether or not the content actually changed
*/
- function editUpdates( $text, $summary, $minoredit, $timestamp_of_pagechange, $newid, $changed = true ) {
+ public function editUpdates( $text, $summary, $minoredit, $timestamp_of_pagechange, $newid, $changed = true ) {
global $wgDeferredUpdateList, $wgMessageCache, $wgUser, $wgParser, $wgEnableParserCache;
wfProfileIn( __METHOD__ );
# Parse the text
# Be careful not to double-PST: $text is usually already PST-ed once
- if ( !$this->mPreparedEdit || $this->mPreparedEdit->output->getFlag( 'vary-revision' ) ) {
+ if( !$this->mPreparedEdit || $this->mPreparedEdit->output->getFlag( 'vary-revision' ) ) {
wfDebug( __METHOD__ . ": No prepared edit or vary-revision is set...\n" );
$editInfo = $this->prepareTextForEdit( $text, $newid );
} else {
}
# Save it to the parser cache
- if ( $wgEnableParserCache ) {
+ if( $wgEnableParserCache ) {
$parserCache = ParserCache::singleton();
$parserCache->save( $editInfo->output, $this, $wgUser );
}
wfRunHooks( 'ArticleEditUpdates', array( &$this, &$editInfo, $changed ) );
if( wfRunHooks( 'ArticleEditUpdatesDeleteFromRecentchanges', array( &$this ) ) ) {
- if ( 0 == mt_rand( 0, 99 ) ) {
+ if( 0 == mt_rand( 0, 99 ) ) {
// Flush old entries from the `recentchanges` table; we do this on
// random requests so as to avoid an increase in writes for no good reason
global $wgRCMaxAge;
$title = $this->mTitle->getPrefixedDBkey();
$shortTitle = $this->mTitle->getDBkey();
- if ( 0 == $id ) {
+ if( 0 == $id ) {
wfProfileOut( __METHOD__ );
return;
}
&& !( $minoredit && $wgUser->isAllowed( 'nominornewtalk' ) ) ) {
if( wfRunHooks('ArticleEditUpdateNewTalk', array( &$this ) ) ) {
$other = User::newFromName( $shortTitle, false );
- if ( !$other ) {
+ if( !$other ) {
wfDebug( __METHOD__.": invalid username\n" );
} elseif( User::isIP( $shortTitle ) ) {
// An anonymous user
}
}
- if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
+ if( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
$wgMessageCache->replace( $shortTitle, $text );
}
/**
* Perform article updates on a special page creation.
*
- * @param Revision $rev
+ * @param $rev Revision object
*
* @todo This is a shitty interface function. Kill it and replace the
* other shitty functions like editUpdates and such so it's not needed
* anymore.
*/
- function createUpdates( $rev ) {
+ public function createUpdates( $rev ) {
$this->mGoodAdjustment = $this->isCountable( $rev->getText() );
$this->mTotalAdjustment = 1;
$this->editUpdates( $rev->getText(), $rev->getComment(),
* Revision as of \<date\>; view current revision
* \<- Previous version | Next Version -\>
*
- * @private
- * @param string $oldid Revision ID of this article revision
+ * @param $oldid String: revision ID of this article revision
*/
- function setOldSubtitle( $oldid=0 ) {
- global $wgLang, $wgOut, $wgUser;
+ public function setOldSubtitle( $oldid = 0 ) {
+ global $wgLang, $wgOut, $wgUser, $wgRequest;
- if ( !wfRunHooks( 'DisplayOldSubtitle', array(&$this, &$oldid) ) ) {
- return;
+ if( !wfRunHooks( 'DisplayOldSubtitle', array( &$this, &$oldid ) ) ) {
+ return;
}
$revision = Revision::newFromId( $oldid );
$td = $wgLang->timeanddate( $this->mTimestamp, true );
$sk = $wgUser->getSkin();
$lnk = $current
- ? wfMsg( 'currentrevisionlink' )
- : $sk->makeKnownLinkObj( $this->mTitle, wfMsg( 'currentrevisionlink' ) );
+ ? wfMsgHtml( 'currentrevisionlink' )
+ : $sk->makeKnownLinkObj( $this->mTitle, wfMsgHtml( 'currentrevisionlink' ) );
$curdiff = $current
- ? wfMsg( 'diff' )
- : $sk->makeKnownLinkObj( $this->mTitle, wfMsg( 'diff' ), 'diff=cur&oldid='.$oldid );
+ ? wfMsgHtml( 'diff' )
+ : $sk->makeKnownLinkObj( $this->mTitle, wfMsgHtml( 'diff' ), 'diff=cur&oldid='.$oldid );
$prev = $this->mTitle->getPreviousRevisionID( $oldid ) ;
$prevlink = $prev
- ? $sk->makeKnownLinkObj( $this->mTitle, wfMsg( 'previousrevision' ), 'direction=prev&oldid='.$oldid )
- : wfMsg( 'previousrevision' );
+ ? $sk->makeKnownLinkObj( $this->mTitle, wfMsgHtml( 'previousrevision' ), 'direction=prev&oldid='.$oldid )
+ : wfMsgHtml( 'previousrevision' );
$prevdiff = $prev
- ? $sk->makeKnownLinkObj( $this->mTitle, wfMsg( 'diff' ), 'diff=prev&oldid='.$oldid )
- : wfMsg( 'diff' );
+ ? $sk->makeKnownLinkObj( $this->mTitle, wfMsgHtml( 'diff' ), 'diff=prev&oldid='.$oldid )
+ : wfMsgHtml( 'diff' );
$nextlink = $current
- ? wfMsg( 'nextrevision' )
- : $sk->makeKnownLinkObj( $this->mTitle, wfMsg( 'nextrevision' ), 'direction=next&oldid='.$oldid );
+ ? wfMsgHtml( 'nextrevision' )
+ : $sk->makeKnownLinkObj( $this->mTitle, wfMsgHtml( 'nextrevision' ), 'direction=next&oldid='.$oldid );
$nextdiff = $current
- ? wfMsg( 'diff' )
- : $sk->makeKnownLinkObj( $this->mTitle, wfMsg( 'diff' ), 'diff=next&oldid='.$oldid );
+ ? wfMsgHtml( 'diff' )
+ : $sk->makeKnownLinkObj( $this->mTitle, wfMsgHtml( 'diff' ), 'diff=next&oldid='.$oldid );
$cdel='';
if( $wgUser->isAllowed( 'deleterevision' ) ) {
$revdel = SpecialPage::getTitleFor( 'Revisiondelete' );
if( $revision->isCurrent() ) {
// We don't handle top deleted edits too well
- $cdel = wfMsgHtml('rev-delundel');
+ $cdel = wfMsgHtml( 'rev-delundel' );
} else if( !$revision->userCan( Revision::DELETED_RESTRICTED ) ) {
// If revision was hidden from sysops
- $cdel = wfMsgHtml('rev-delundel');
+ $cdel = wfMsgHtml( 'rev-delundel' );
} else {
$cdel = $sk->makeKnownLinkObj( $revdel,
wfMsgHtml('rev-delundel'),
}
$cdel = "(<small>$cdel</small>) ";
}
- # Show user links if allowed to see them. Normally they
- # are hidden regardless, but since we can already see the text here...
- $userlinks = $sk->revUserTools( $revision, false );
+ $unhide = $wgRequest->getInt('unhide') == 1 && $wgUser->matchEditToken( $wgRequest->getVal('token'), $oldid );
+ # Show user links if allowed to see them. If hidden, then show them only if requested...
+ $userlinks = $sk->revUserTools( $revision, !$unhide );
$m = wfMsg( 'revision-info-current' );
$infomsg = $current && !wfEmptyMsg( 'revision-info-current', $m ) && $m != '-'
? 'revision-info-current'
: 'revision-info';
- $r = "\n\t\t\t\t<div id=\"mw-{$infomsg}\">" . wfMsg( $infomsg, $td, $userlinks ) . "</div>\n" .
+ $r = "\n\t\t\t\t<div id=\"mw-{$infomsg}\">" . wfMsgExt( $infomsg, array( 'parseinline', 'replaceafter' ),
+ $td, $userlinks, $revision->getID() ) . "</div>\n" .
- "\n\t\t\t\t<div id=\"mw-revision-nav\">" . $cdel . wfMsg( 'revision-nav', $prevdiff,
+ "\n\t\t\t\t<div id=\"mw-revision-nav\">" . $cdel . wfMsgHtml( 'revision-nav', $prevdiff,
$prevlink, $lnk, $curdiff, $nextlink, $nextdiff ) . "</div>\n\t\t\t";
$wgOut->setSubtitle( $r );
}
* This function is called right before saving the wikitext,
* so we can do things like signatures and links-in-context.
*
- * @param string $text
+ * @param $text String
*/
- function preSaveTransform( $text ) {
+ public function preSaveTransform( $text ) {
global $wgParser, $wgUser;
return $wgParser->preSaveTransform( $text, $this->mTitle, $wgUser, ParserOptions::newFromUser( $wgUser ) );
}
* output to the client that is necessary for this request.
* (that is, it has sent a cached version of the page)
*/
- function tryFileCache() {
+ protected function tryFileCache() {
static $called = false;
if( $called ) {
wfDebug( "Article::tryFileCache(): called twice!?\n" );
}
$called = true;
if( $this->isFileCacheable() ) {
- $touched = $this->mTouched;
$cache = new HTMLFileCache( $this->mTitle );
- if( $cache->isFileCacheGood( $touched ) ) {
+ if( $cache->isFileCacheGood( $this->mTouched ) ) {
wfDebug( "Article::tryFileCache(): about to load file\n" );
$cache->loadFromFileCache();
return true;
* Check if the page can be cached
* @return bool
*/
- function isFileCacheable() {
- global $wgUser, $wgUseFileCache, $wgShowIPinHeader, $wgRequest, $wgLang, $wgContLang;
- // Get all query values
- $queryVals = $wgRequest->getValues();
- foreach( $queryVals as $query => $val ) {
- if( $query == 'title' || ($query == 'action' && $val == 'view') ) {
- // Normal page view in query form
- } else {
- return false;
+ public function isFileCacheable() {
+ $cacheable = false;
+ if( HTMLFileCache::useFileCache() ) {
+ $cacheable = $this->getID() && !$this->mRedirectedFrom;
+ // Extension may have reason to disable file caching on some pages.
+ if( $cacheable ) {
+ $cacheable = wfRunHooks( 'IsFileCacheable', array( &$this ) );
}
}
- // Check for non-standard user language; this covers uselang,
- // and extensions for auto-detecting user language.
- $ulang = $wgLang->getCode();
- $clang = $wgContLang->getCode();
-
- $cacheable = $wgUseFileCache
- && (!$wgShowIPinHeader)
- && ($this->getID() > 0)
- && ($wgUser->isAnon())
- && (!$wgUser->getNewtalk())
- && (!$this->mRedirectedFrom)
- && ($ulang === $clang);
- // Extension may have reason to disable file caching on some pages.
- if( $cacheable ) {
- $cacheable = wfRunHooks( 'IsFileCacheable', array( &$this ) );
- }
return $cacheable;
}
* Loads page_touched and returns a value indicating if it should be used
*
*/
- function checkTouched() {
+ public function checkTouched() {
if( !$this->mDataLoaded ) {
$this->loadPageData();
}
/**
* Get the page_touched field
*/
- function getTouched() {
+ public function getTouched() {
# Ensure that page data has been loaded
if( !$this->mDataLoaded ) {
$this->loadPageData();
/**
* Get the page_latest field
*/
- function getLatest() {
- if ( !$this->mDataLoaded ) {
+ public function getLatest() {
+ if( !$this->mDataLoaded ) {
$this->loadPageData();
}
return $this->mLatest;
* 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 bool $minor whereas it's a minor modification
+ * @param $text String: text submitted
+ * @param $comment String: comment submitted
+ * @param $minor Boolean: whereas it's a minor modification
*/
- function quickEdit( $text, $comment = '', $minor = 0 ) {
+ public function quickEdit( $text, $comment = '', $minor = 0 ) {
wfProfileIn( __METHOD__ );
$dbw = wfGetDB( DB_MASTER );
$revision->insertOn( $dbw );
$this->updateRevisionOn( $dbw, $revision );
- wfRunHooks( 'NewRevisionFromEditComplete', array($this, $revision, false) );
+ wfRunHooks( 'NewRevisionFromEditComplete', array($this, $revision, false, $wgUser) );
wfProfileOut( __METHOD__ );
}
/**
* Used to increment the view counter
*
- * @static
- * @param integer $id article id
+ * @param $id Integer: article id
*/
- function incViewCount( $id ) {
+ public static function incViewCount( $id ) {
$id = intval( $id );
global $wgHitcounterUpdateFreq, $wgDBtype;
wfProfileIn( 'Article::incViewCount-collect' );
$old_user_abort = ignore_user_abort( true );
- if ($wgDBtype == 'mysql')
+ if($wgDBtype == 'mysql')
$dbw->query("LOCK TABLES $hitcounterTable WRITE");
$tabletype = $wgDBtype == 'mysql' ? "ENGINE=HEAP " : '';
$dbw->query("CREATE TEMPORARY TABLE $acchitsTable $tabletype AS ".
"SELECT hc_id,COUNT(*) AS hc_n FROM $hitcounterTable ".
'GROUP BY hc_id');
$dbw->query("DELETE FROM $hitcounterTable");
- if ($wgDBtype == 'mysql') {
+ if($wgDBtype == 'mysql') {
$dbw->query('UNLOCK TABLES');
$dbw->query("UPDATE $pageTable,$acchitsTable SET page_counter=page_counter + hc_n ".
'WHERE page_id = hc_id');
* This is a good place to put code to clear caches, for instance.
*
* This is called on page move and undelete, as well as edit
- * @static
- * @param $title_obj a title object
+ *
+ * @param $title a title object
*/
public static function onArticleCreate( $title ) {
# Update existence markers on article/talk tabs...
- if ( $title->isTalkPage() ) {
+ if( $title->isTalkPage() ) {
$other = $title->getSubjectPage();
} else {
$other = $title->getTalkPage();
}
public static function onArticleDelete( $title ) {
- global $wgUseFileCache, $wgMessageCache;
+ global $wgMessageCache;
# Update existence markers on article/talk tabs...
if( $title->isTalkPage() ) {
$other = $title->getSubjectPage();
$title->purgeSquid();
# File cache
- if ( $wgUseFileCache ) {
- $cm = new HTMLFileCache( $title );
- @unlink( $cm->fileCacheName() );
- }
+ HTMLFileCache::clearFileCache( $title );
# Messages
if( $title->getNamespace() == NS_MEDIAWIKI ) {
$wgMessageCache->replace( $title->getDBkey(), false );
}
# Images
- if( $title->getNamespace() == NS_IMAGE ) {
+ if( $title->getNamespace() == NS_FILE ) {
$update = new HTMLCacheUpdate( $title, 'imagelinks' );
$update->doUpdate();
}
/**
* Purge caches on page update etc
*/
- public static function onArticleEdit( $title, $touchTemplates = true ) {
- global $wgDeferredUpdateList, $wgUseFileCache;
+ public static function onArticleEdit( $title, $transclusions = 'transclusions' ) {
+ global $wgDeferredUpdateList;
// Invalidate caches of articles which include this page
- if( $touchTemplates )
+ if( $transclusions !== 'skiptransclusions' )
$wgDeferredUpdateList[] = new HTMLCacheUpdate( $title, 'templatelinks' );
// Invalidate the caches of all pages which redirect here
$title->purgeSquid();
# Clear file cache for this page only
- if ( $wgUseFileCache ) {
- $cm = new HTMLFileCache( $title );
- @unlink( $cm->fileCacheName() );
- }
+ HTMLFileCache::clearFileCache( $title );
}
/**#@-*/
* Overriden by ImagePage class, only present here to avoid a fatal error
* Called for ?action=revert
*/
- public function revert(){
+ public function revert() {
global $wgOut;
$wgOut->showErrorPage( 'nosuchaction', 'nosuchactiontext' );
}
/**
* Info about this page
* Called for ?action=info when $wgAllowPageInfo is on.
- *
- * @public
*/
- function info() {
+ public function info() {
global $wgLang, $wgOut, $wgAllowPageInfo, $wgUser;
- if ( !$wgAllowPageInfo ) {
+ if( !$wgAllowPageInfo ) {
$wgOut->showErrorPage( 'nosuchaction', 'nosuchactiontext' );
return;
}
$wgOut->setPagetitle( $page->getPrefixedText() );
$wgOut->setPageTitleActionText( wfMsg( 'info_short' ) );
- $wgOut->setSubtitle( wfMsg( 'infosubtitle' ) );
+ $wgOut->setSubtitle( wfMsgHtml( 'infosubtitle' ) );
if( !$this->mTitle->exists() ) {
- $wgOut->addH
tml( '<div class="noarticletext">' );
+ $wgOut->addH
TML( '<div class="noarticletext">' );
if( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
// This doesn't quite make sense; the user is asking for
// information about the _page_, not the message... -- RC
- $wgOut->addHtml( htmlspecialchars( wfMsgWeirdKey( $this->mTitle->getText() ) ) );
+ $wgOut->addHTML( htmlspecialchars( wfMsgWeirdKey( $this->mTitle->getText() ) ) );
} else {
$msg = $wgUser->isLoggedIn()
? 'noarticletext'
: 'noarticletextanon';
- $wgOut->addHtml( wfMsgExt( $msg, 'parse' ) );
+ $wgOut->addHTML( wfMsgExt( $msg, 'parse' ) );
}
- $wgOut->addHtml( '</div>' );
+ $wgOut->addHTML( '</div>' );
} else {
$dbr = wfGetDB( DB_SLAVE );
$wl_clause = array(
$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
+ * @param $title Title object
* @return array
- * @private
*/
- function pageCountInfo( $title ) {
+ protected function pageCountInfo( $title ) {
$id = $title->getArticleId();
if( $id == 0 ) {
return false;
}
-
$dbr = wfGetDB( DB_SLAVE );
-
$rev_clause = array( 'rev_page' => $id );
-
$edits = $dbr->selectField(
'revision',
'COUNT(rev_page)',
$rev_clause,
__METHOD__,
- $this->getSelectOptions() );
-
+ $this->getSelectOptions()
+ );
$authors = $dbr->selectField(
'revision',
'COUNT(DISTINCT rev_user_text)',
$rev_clause,
__METHOD__,
- $this->getSelectOptions() );
-
+ $this->getSelectOptions()
+ );
return array( 'edits' => $edits, 'authors' => $authors );
}
* Return a list of templates used by this article.
* Uses the templatelinks table
*
- * @return array Array of Title objects
+ * @return Array of Title objects
*/
public function getUsedTemplates() {
$result = array();
if( $id == 0 ) {
return array();
}
-
$dbr = wfGetDB( DB_SLAVE );
$res = $dbr->select( array( 'templatelinks' ),
array( 'tl_namespace', 'tl_title' ),
array( 'tl_from' => $id ),
__METHOD__ );
- if( false !== $res ) {
+ if( $res !== false ) {
foreach( $res as $row ) {
$result[] = Title::makeTitle( $row->tl_namespace, $row->tl_title );
}
* Returns a list of hidden categories this page is a member of.
* Uses the page_props and categorylinks tables.
*
- * @return array Array of Title objects
+ * @return Array of Title objects
*/
public function getHiddenCategories() {
$result = array();
if( $id == 0 ) {
return array();
}
-
$dbr = wfGetDB( DB_SLAVE );
$res = $dbr->select( array( 'categorylinks', 'page_props', 'page' ),
array( 'cl_to' ),
array( 'cl_from' => $id, 'pp_page=page_id', 'pp_propname' => 'hiddencat',
'page_namespace' => NS_CATEGORY, 'page_title=cl_to'),
__METHOD__ );
- if ( false !== $res ) {
+ if( $res !== false ) {
foreach( $res as $row ) {
$result[] = Title::makeTitle( NS_CATEGORY, $row->cl_to );
}
/**
* Return an applicable autosummary if one exists for the given edit.
- * @param string $oldtext The previous text of the page.
- * @param string $newtext The submitted text of the page.
- * @param bitmask $flags A bitmask of flags submitted for the edit.
+ * @param $oldtext String: the previous text of the page.
+ * @param $newtext String: The submitted text of the page.
+ * @param $flags Bitmask: a bitmask of flags submitted for the edit.
* @return string An appropriate autosummary, or an empty string.
*/
public static function getAutosummary( $oldtext, $newtext, $flags ) {
# Decide what kind of autosummary is needed.
# Redirect autosummaries
+ $ot = Title::newFromRedirect( $oldtext );
$rt = Title::newFromRedirect( $newtext );
- if( is_object( $rt ) ) {
+ if( is_object( $rt ) && ( !is_object( $ot ) || !$rt->equals( $ot ) || $ot->getFragment() != $rt->getFragment() ) ) {
return wfMsgForContent( 'autoredircomment', $rt->getFullText() );
}
global $wgContLang;
$truncatedtext = $wgContLang->truncate(
str_replace("\n", ' ', $newtext),
- max( 0, 200 - strlen( wfMsgForContent( 'autosumm-new') ) ),
+ max( 0, 200 - strlen( wfMsgForContent( 'autosumm-new' ) ) ),
'...' );
return wfMsgForContent( 'autosumm-new', $truncatedtext );
}
# Blanking autosummaries
if( $oldtext != '' && $newtext == '' ) {
- return wfMsgForContent('autosumm-blank');
+ return wfMsgForContent( 'autosumm-blank' );
} elseif( strlen( $oldtext ) > 10 * strlen( $newtext ) && strlen( $newtext ) < 500) {
# Removing more than 90% of the article
global $wgContLang;
* Saves the text into the parser cache if possible.
* Updates templatelinks if it is out of date.
*
- * @param string $text
- * @param bool $cache
+ * @param $text String
+ * @param $cache Boolean
*/
public function outputWikiText( $text, $cache = true ) {
global $wgParser, $wgUser, $wgOut, $wgEnableParserCache, $wgUseFileCache;
$popts, true, true, $this->getRevIdFetched() );
$popts->setTidy(false);
$popts->enableLimitReport( false );
- if ( $wgEnableParserCache && $cache && $this && $parserOutput->getCacheTime() != -1 ) {
+ if( $wgEnableParserCache && $cache && $this && $parserOutput->getCacheTime() != -1 ) {
$parserCache = ParserCache::singleton();
$parserCache->save( $parserOutput, $this, $wgUser );
}
$wgUseFileCache = false;
}
- if ( !wfReadOnly() && $this->mTitle->areRestrictionsCascading() ) {
+ if( $this->isCurrent() && !wfReadOnly() && $this->mTitle->areRestrictionsCascading() ) {
// templatelinks table may have become out of sync,
// especially if using variable-based transclusions.
// For paranoia, check if things have changed and if
global $wgContLang;
- if ( false !== $res ) {
+ if( $res !== false ) {
foreach( $res as $row ) {
$tlTemplates[] = $wgContLang->getNsText( $row->tl_namespace ) . ':' . $row->tl_title ;
}
# Get the diff
$templates_diff = array_diff( $poTemplates, $tlTemplates );
- if ( count( $templates_diff ) > 0 ) {
+ if( count( $templates_diff ) > 0 ) {
# Whee, link updates time.
$u = new LinksUpdate( $this->mTitle, $parserOutput );
$u->doUpdate();
if( $ns == NS_CATEGORY ) {
$addFields[] = 'cat_subcats = cat_subcats + 1';
$removeFields[] = 'cat_subcats = cat_subcats - 1';
- } elseif( $ns == NS_IMAGE ) {
+ } elseif( $ns == NS_FILE ) {
$addFields[] = 'cat_files = cat_files + 1';
$removeFields[] = 'cat_files = cat_files - 1';
}
- if ( $added ) {
+ if( $added ) {
$dbw->update(
'category',
$addFields,
__METHOD__
);
}
- if ( $deleted ) {
+ if( $deleted ) {
$dbw->update(
'category',
$removeFields,
dépôts / lhc / web / wiklou.git / blobdiff