Update to MediaWiki 1.19.0

1 files changed, 115 insertions, 162 deletions

diff --git a/includes/Wiki.php b/includes/Wiki.php
index f535b981..6ead57c4 100644
--- a/includes/Wiki.php
+++ b/includes/Wiki.php
@@ -33,18 +33,29 @@ class MediaWiki {
 	 */
 	private $context;
 
-	public function request( WebRequest $x = null ){
+	/**
+	 * @param $x null|WebRequest
+	 * @return WebRequest
+	 */
+	public function request( WebRequest $x = null ) {
 		$old = $this->context->getRequest();
 		$this->context->setRequest( $x );
 		return $old;
 	}
 
-	public function output( OutputPage $x = null ){
+	/**
+	 * @param $x null|OutputPage
+	 * @return OutputPage
+	 */
+	public function output( OutputPage $x = null ) {
 		$old = $this->context->getOutput();
 		$this->context->setOutput( $x );
 		return $old;
 	}
 
+	/**
+	 * @param IContextSource|null $context
+	 */
 	public function __construct( IContextSource $context = null ) {
 		if ( !$context ) {
 			$context = RequestContext::getMain();
@@ -65,6 +76,7 @@ class MediaWiki {
 		$request = $this->context->getRequest();
 		$curid = $request->getInt( 'curid' );
 		$title = $request->getVal( 'title' );
+		$action = $request->getVal( 'action', 'view' );
 
 		if ( $request->getCheck( 'search' ) ) {
 			// Compatibility with old search URLs which didn't use Special:Search
@@ -74,7 +86,7 @@ class MediaWiki {
 		} elseif ( $curid ) {
 			// URLs like this are generated by RC, because rc_title isn't always accurate
 			$ret = Title::newFromID( $curid );
-		} elseif ( $title == '' && $this->getAction() != 'delete' ) {
+		} elseif ( $title == '' && $action != 'delete' ) {
 			$ret = Title::newMainPage();
 		} else {
 			$ret = Title::newFromURL( $title );
@@ -92,7 +104,7 @@ class MediaWiki {
 			}
 		}
 		// For non-special titles, check for implicit titles
-		if ( is_null( $ret ) || $ret->getNamespace() != NS_SPECIAL ) {
+		if ( is_null( $ret ) || !$ret->isSpecialPage() ) {
 			// We can have urls with just ?diff=,?oldid= or even just ?diff=
 			$oldid = $request->getInt( 'oldid' );
 			$oldid = $oldid ? $oldid : $request->getInt( 'diff' );
@@ -114,7 +126,7 @@ class MediaWiki {
 	 * Get the Title object that we'll be acting on, as specified in the WebRequest
 	 * @return Title
 	 */
-	public function getTitle(){
+	public function getTitle() {
 		if( $this->context->getTitle() === null ){
 			$this->context->setTitle( $this->parseTitle() );
 		}
@@ -146,34 +158,45 @@ class MediaWiki {
 			$output->setPrintable();
 		}
 
-		$pageView = false; // was an article or special page viewed?
+		$unused = null; // To pass it by reference
+		wfRunHooks( 'BeforeInitialize', array( &$title, &$unused, &$output, &$user, $request, $this ) );
 
-		wfRunHooks( 'BeforeInitialize',
-			array( &$title, null, &$output, &$user, $request, $this ) );
 		// Invalid titles. Bug 21776: The interwikis must redirect even if the page name is empty.
 		if ( is_null( $title ) || ( $title->getDBkey() == '' && $title->getInterwiki() == '' ) ||
 			$title->isSpecial( 'Badtitle' ) )
 		{
 			$this->context->setTitle( SpecialPage::getTitleFor( 'Badtitle' ) );
-			// Die now before we mess up $wgArticle and the skin stops working
-			throw new ErrorPageError( 'badtitle', 'badtitletext' );
-		// If the user is not logged in, the Namespace:title of the article must be in
-		// the Read array in order for the user to see it. (We have to check here to
-		// catch special pages etc. We check again in Article::view())
-		} elseif ( !$title->userCanRead() ) {
-			// Bug 32276: allowing the skin to generate output with $wgTitle 
-			// set to the input title would allow anonymous users to 
-			// determine whether a page exists, potentially leaking private data. In fact, the 
-			// curid and oldid request  parameters would allow page titles to be enumerated even 
-			// when they are not guessable. So we reset the title to Special:Badtitle before the 
+			wfProfileOut( __METHOD__ );
+			throw new BadTitleError();
+		}
+
+		// Check user's permissions to read this page.
+		// We have to check here to catch special pages etc.
+		// We will check again in Article::view().
+		$permErrors = $title->getUserPermissionsErrors( 'read', $user );
+		if ( count( $permErrors ) ) {
+			// Bug 32276: allowing the skin to generate output with $wgTitle or
+			// $this->context->title set to the input title would allow anonymous users to
+			// determine whether a page exists, potentially leaking private data. In fact, the
+			// curid and oldid request  parameters would allow page titles to be enumerated even
+			// when they are not guessable. So we reset the title to Special:Badtitle before the
 			// permissions error is displayed.
-			$badtitle = SpecialPage::getTitleFor( 'Badtitle' );
-			$output->setTitle( $badtitle );
-			$wgTitle = $badtitle;
+			//
+			// The skin mostly uses $this->context->getTitle() these days, but some extensions
+			// still use $wgTitle.
+
+			$badTitle = SpecialPage::getTitleFor( 'Badtitle' );
+			$this->context->setTitle( $badTitle );
+			$wgTitle = $badTitle;
+
+			wfProfileOut( __METHOD__ );
+			throw new PermissionsError( 'read', $permErrors );
+		}
+
+		$pageView = false; // was an article or special page viewed?
 
-			$output->loginToUse();
 		// Interwiki redirects
-		} elseif ( $title->getInterwiki() != '' ) {
+		if ( $title->getInterwiki() != '' ) {
 			$rdfrom = $request->getVal( 'rdfrom' );
 			if ( $rdfrom ) {
 				$url = $title->getFullURL( 'rdfrom=' . urlencode( $rdfrom ) );
@@ -191,7 +214,7 @@ class MediaWiki {
 			} else {
 				$this->context->setTitle( SpecialPage::getTitleFor( 'Badtitle' ) );
 				wfProfileOut( __METHOD__ );
-				throw new ErrorPageError( 'badtitle', 'badtitletext' );
+				throw new BadTitleError();
 			}
 		// Redirect loops, no title in URL, $wgUsePathInfo URLs, and URLs with a variant
 		} elseif ( $request->getVal( 'action', 'view' ) == 'view' && !$request->wasPosted()
@@ -200,7 +223,7 @@ class MediaWiki {
 			&& !count( $request->getValueNames( array( 'action', 'title' ) ) )
 			&& wfRunHooks( 'TestCanonicalRedirect', array( $request, $title, $output ) ) )
 		{
-			if ( $title->getNamespace() == NS_SPECIAL ) {
+			if ( $title->isSpecialPage() ) {
 				list( $name, $subpage ) = SpecialPageFactory::resolveAlias( $title->getDBkey() );
 				if ( $name ) {
 					$title = SpecialPage::getTitleFor( $name, $subpage );
@@ -228,7 +251,7 @@ class MediaWiki {
 						"\$wgArticlePath setting and/or toggle \$wgUsePathInfo " .
 						"to true.";
 				}
-				wfHttpError( 500, "Internal error", $message );
+				throw new HttpError( 500, $message );
 			} else {
 				$output->setSquidMaxage( 1200 );
 				$output->redirect( $targetUrl, '301' );
@@ -245,8 +268,8 @@ class MediaWiki {
 			if ( is_object( $article ) ) {
 				$pageView = true;
 				/**
-				 * $wgArticle is deprecated, do not use it. This will possibly be removed
-				 * entirely in 1.20 or 1.21
+				 * $wgArticle is deprecated, do not use it.
+				 * This will be removed entirely in 1.20.
 				 * @deprecated since 1.18
 				 */
 				global $wgArticle;
@@ -278,39 +301,22 @@ class MediaWiki {
 	 * @return Article object
 	 */
 	public static function articleFromTitle( $title, IContextSource $context ) {
+		wfDeprecated( __METHOD__, '1.18' );
 		return Article::newFromTitle( $title, $context );
 	}
 
 	/**
-	 * Returns the action that will be executed, not necessarily the one passed
-	 * passed through the "action" parameter. Actions disabled in
-	 * $wgDisabledActions will be replaced by "nosuchaction"
+	 * Returns the name of the action that will be executed.
 	 *
-	 * @return String: action
+	 * @return string: action
 	 */
 	public function getAction() {
-		global $wgDisabledActions;
-
-		$request = $this->context->getRequest();
-		$action = $request->getVal( 'action', 'view' );
-
-		// Check for disabled actions
-		if ( in_array( $action, $wgDisabledActions ) ) {
-			return 'nosuchaction';
+		static $action = null;
+		
+		if ( $action === null ) {
+			$action = Action::getActionName( $this->context );
 		}
 
-		// Workaround for bug #20966: inability of IE to provide an action dependent
-		// on which submit button is clicked.
-		if ( $action === 'historysubmit' ) {
-			if ( $request->getBool( 'revisiondelete' ) ) {
-				return 'revisiondelete';
-			} else {
-				return 'view';
-			}
-		} elseif ( $action == 'editredlink' ) {
-			return 'edit';
-		}
-		
 		return $action;
 	}
 
@@ -325,19 +331,21 @@ class MediaWiki {
 
 		wfProfileIn( __METHOD__ );
 
-		$request = $this->context->getRequest();
 		$title = $this->context->getTitle();
-
-		$action = $request->getVal( 'action', 'view' );
 		$article = Article::newFromTitle( $title, $this->context );
+		$this->context->setWikiPage( $article->getPage() );
 		// NS_MEDIAWIKI has no redirects.
 		// It is also used for CSS/JS, so performance matters here...
 		if ( $title->getNamespace() == NS_MEDIAWIKI ) {
 			wfProfileOut( __METHOD__ );
 			return $article;
 		}
+
+		$request = $this->context->getRequest();
+
 		// Namespace might change when using redirects
 		// Check for redirects ...
+		$action = $request->getVal( 'action', 'view' );
 		$file = ( $title->getNamespace() == NS_FILE ) ? $article->getFile() : null;
 		if ( ( $action == 'view' || $action == 'render' ) 	// ... for actions that show content
 			&& !$request->getVal( 'oldid' ) &&    // ... and are not old revisions
@@ -372,10 +380,12 @@ class MediaWiki {
 						$rarticle->setRedirectedFrom( $title );
 						$article = $rarticle;
 						$this->context->setTitle( $target );
+						$this->context->setWikiPage( $article->getPage() );
 					}
 				}
 			} else {
 				$this->context->setTitle( $article->getTitle() );
+				$this->context->setWikiPage( $article->getPage() );
 			}
 		}
 
@@ -395,7 +405,7 @@ class MediaWiki {
 		// Output everything!
 		$this->context->getOutput()->output();
 		// Do any deferred jobs
-		wfDoUpdates( 'commit' );
+		DeferredUpdates::doUpdates( 'commit' );
 		$this->doJobs();
 		wfProfileOut( __METHOD__ );
 	}
@@ -421,9 +431,9 @@ class MediaWiki {
 
 		while ( $n-- && false != ( $job = Job::pop() ) ) {
 			$output = $job->toString() . "\n";
-			$t = -wfTime();
+			$t = - microtime( true );
 			$success = $job->run();
-			$t += wfTime();
+			$t += microtime( true );
 			$t = round( $t * 1000 );
 			if ( !$success ) {
 				$output .= "Error: " . $job->getLastError() . ", Time: $t ms\n";
@@ -450,11 +460,9 @@ class MediaWiki {
 	/**
 	 * Perform one of the "standard" actions
 	 *
-	 * @param $article Article
+	 * @param $page Page
 	 */
-	private function performAction( Page $article ) {
-		global $wgSquidMaxage, $wgUseExternalEditor;
-
+	private function performAction( Page $page ) {
 		wfProfileIn( __METHOD__ );
 
 		$request = $this->context->getRequest();
@@ -463,7 +471,7 @@ class MediaWiki {
 		$user = $this->context->getUser();
 
 		if ( !wfRunHooks( 'MediaWikiPerformAction',
-			array( $output, $article, $title, $user, $request, $this ) ) )
+			array( $output, $page, $title, $user, $request, $this ) ) )
 		{
 			wfProfileOut( __METHOD__ );
 			return;
@@ -471,69 +479,17 @@ class MediaWiki {
 
 		$act = $this->getAction();
 
-		$action = Action::factory( $act, $article );
+		$action = Action::factory( $act, $page );
 		if ( $action instanceof Action ) {
 			$action->show();
 			wfProfileOut( __METHOD__ );
 			return;
 		}
 
-		switch( $act ) {
-			case 'view':
-				$output->setSquidMaxage( $wgSquidMaxage );
-				$article->view();
-				break;
-			case 'raw': // includes JS/CSS
-				wfProfileIn( __METHOD__ . '-raw' );
-				$raw = new RawPage( $article );
-				$raw->view();
-				wfProfileOut( __METHOD__ . '-raw' );
-				break;
-			case 'delete':
-			case 'protect':
-			case 'unprotect':
-			case 'render':
-				$article->$act();
-				break;
-			case 'submit':
-				if ( session_id() == '' ) {
-					// Send a cookie so anons get talk message notifications
-					wfSetupSession();
-				}
-				// Continue...
-			case 'edit':
-				if ( wfRunHooks( 'CustomEditor', array( $article, $user ) ) ) {
-					$internal = $request->getVal( 'internaledit' );
-					$external = $request->getVal( 'externaledit' );
-					$section = $request->getVal( 'section' );
-					$oldid = $request->getVal( 'oldid' );
-					if ( !$wgUseExternalEditor || $act == 'submit' || $internal ||
-					   $section || $oldid ||
-					   ( !$user->getOption( 'externaleditor' ) && !$external ) )
-					{
-						$editor = new EditPage( $article );
-						$editor->submit();
-					} elseif ( $wgUseExternalEditor
-						&& ( $external || $user->getOption( 'externaleditor' ) ) )
-					{
-						$mode = $request->getVal( 'mode' );
-						$extedit = new ExternalEdit( $article->getTitle(), $mode );
-						$extedit->edit();
-					}
-				}
-				break;
-			case 'history':
-				if ( $request->getFullRequestURL() == $title->getInternalURL( 'action=history' ) ) {
-					$output->setSquidMaxage( $wgSquidMaxage );
-				}
-				$history = new HistoryPage( $article );
-				$history->history();
-				break;
-			default:
-				if ( wfRunHooks( 'UnknownAction', array( $act, $article ) ) ) {
-					$output->showErrorPage( 'nosuchaction', 'nosuchactiontext' );
-				}
+		if ( wfRunHooks( 'UnknownAction', array( $request->getVal( 'action', 'view' ), $page ) ) ) {
+			$output->showErrorPage( 'nosuchaction', 'nosuchactiontext' );
 		}
+
 		wfProfileOut( __METHOD__ );
 	}
 
@@ -543,7 +499,7 @@ class MediaWiki {
 	 */
 	public function run() {
 		try {
-			$this->checkMaxLag( true );
+			$this->checkMaxLag();
 			$this->main();
 			$this->restInPeace();
 		} catch ( Exception $e ) {
@@ -554,38 +510,29 @@ class MediaWiki {
 	/**
 	 * Checks if the request should abort due to a lagged server,
 	 * for given maxlag parameter.
-	 *
-	 * @param boolean $abort True if this class should abort the
-	 * script execution. False to return the result as a boolean.
-	 * @return boolean True if we passed the check, false if we surpass the maxlag
+	 * @return bool
 	 */
-	private function checkMaxLag( $abort ) {
+	private function checkMaxLag() {
 		global $wgShowHostnames;
 
 		wfProfileIn( __METHOD__ );
 		$maxLag = $this->context->getRequest()->getVal( 'maxlag' );
 		if ( !is_null( $maxLag ) ) {
-			$lb = wfGetLB(); // foo()->bar() is not supported in PHP4
-			list( $host, $lag ) = $lb->getMaxLag();
+			list( $host, $lag ) = wfGetLB()->getMaxLag();
 			if ( $lag > $maxLag ) {
-				if ( $abort ) {
-					$resp = $this->context->getRequest()->response();
-					$resp->header( 'HTTP/1.1 503 Service Unavailable' );
-					$resp->header( 'Retry-After: ' . max( intval( $maxLag ), 5 ) );
-					$resp->header( 'X-Database-Lag: ' . intval( $lag ) );
-					$resp->header( 'Content-Type: text/plain' );
-					if( $wgShowHostnames ) {
-						echo "Waiting for $host: $lag seconds lagged\n";
-					} else {
-						echo "Waiting for a database server: $lag seconds lagged\n";
-					}
+				$resp = $this->context->getRequest()->response();
+				$resp->header( 'HTTP/1.1 503 Service Unavailable' );
+				$resp->header( 'Retry-After: ' . max( intval( $maxLag ), 5 ) );
+				$resp->header( 'X-Database-Lag: ' . intval( $lag ) );
+				$resp->header( 'Content-Type: text/plain' );
+				if( $wgShowHostnames ) {
+					echo "Waiting for $host: $lag seconds lagged\n";
+				} else {
+					echo "Waiting for a database server: $lag seconds lagged\n";
 				}
 
 				wfProfileOut( __METHOD__ );
 
-				if ( !$abort ) {
-					return false;
-				}
 				exit;
 			}
 		}
@@ -598,36 +545,42 @@ class MediaWiki {
 
 		wfProfileIn( __METHOD__ );
 
-		# Set title from request parameters
-		$wgTitle = $this->getTitle();
-		$action = $this->getAction();
-		$user = $this->context->getUser();
+		$request = $this->context->getRequest();
+
+		// Send Ajax requests to the Ajax dispatcher.
+		if ( $wgUseAjax && $request->getVal( 'action', 'view' ) == 'ajax' ) {
+
+			// Set a dummy title, because $wgTitle == null might break things
+			$title = Title::makeTitle( NS_MAIN, 'AJAX' );
+			$this->context->setTitle( $title );
+			$wgTitle = $title;
 
-		# Send Ajax requests to the Ajax dispatcher.
-		if ( $wgUseAjax && $action == 'ajax' ) {
 			$dispatcher = new AjaxDispatcher();
 			$dispatcher->performAction();
 			wfProfileOut( __METHOD__ );
 			return;
 		}
 
-		if ( $wgUseFileCache && $wgTitle->getNamespace() != NS_SPECIAL ) {
+		// Get title from request parameters,
+		// is set on the fly by parseTitle the first time.
+		$title = $this->getTitle();
+		$action = $this->getAction();
+		$wgTitle = $title;
+
+		if ( $wgUseFileCache && $title->getNamespace() >= 0 ) {
 			wfProfileIn( 'main-try-filecache' );
-			// Raw pages should handle cache control on their own,
-			// even when using file cache. This reduces hits from clients.
-			if ( HTMLFileCache::useFileCache() ) {
-				/* Try low-level file cache hit */
-				$cache = new HTMLFileCache( $wgTitle, $action );
-				if ( $cache->isFileCacheGood( /* Assume up to date */ ) ) {
-					/* Check incoming headers to see if client has this cached */
-					$timestamp = $cache->fileCacheTime();
+			if ( HTMLFileCache::useFileCache( $this->context ) ) {
+				// Try low-level file cache hit
+				$cache = HTMLFileCache::newFromTitle( $title, $action );
+				if ( $cache->isCacheGood( /* Assume up to date */ ) ) {
+					// Check incoming headers to see if client has this cached
+					$timestamp = $cache->cacheTimestamp();
 					if ( !$this->context->getOutput()->checkLastModified( $timestamp ) ) {
-						$cache->loadFromFileCache();
+						$cache->loadFromFileCache( $this->context );
 					}
-					# Do any stats increment/watchlist stuff
-					$article = WikiPage::factory( $wgTitle );
-					$article->doViewUpdates( $user );
-					# Tell OutputPage that output is taken care of
+					// Do any stats increment/watchlist stuff
+					$this->context->getWikiPage()->doViewUpdates( $this->context->getUser() );
+					// Tell OutputPage that output is taken care of
 					$this->context->getOutput()->disable();
 					wfProfileOut( 'main-try-filecache' );
 					wfProfileOut( __METHOD__ );