From: Sam Reed <reedy@users.mediawiki.org>
Date: Fri, 17 Jun 2011 10:07:40 +0000 (+0000)
Subject: (29 lines skipped) [17-Jun-2011 10:03:59] PHP Notice:  Use of RequestContext::__get... 
X-Git-Tag: 1.31.0-rc.0~29479
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=8f2baf7b8e6640d87440a93adbf2bf5ed3f9e94f;p=lhc%2Fweb%2Fwiklou.git

(29 lines skipped) [17-Jun-2011 10:03:59] PHP Notice:  Use of RequestContext::__get() is deprecated; use $context->getFoo() instead is  deprecated. [Called from MediaWiki::parseTitle in /www/w/includes/Wiki.php at line 36] in /www/w/includes/GlobalFunctions.php on line 3342


Swap $this->context->request to $this->context->getRequest()
---

diff --git a/includes/Wiki.php b/includes/Wiki.php
index 6ce2d48f41..53b456a9e3 100644
--- a/includes/Wiki.php
+++ b/includes/Wiki.php
@@ -33,10 +33,11 @@ class MediaWiki {
 	private function parseTitle() {
 		global $wgContLang;
 
-		$curid = $this->context->request->getInt( 'curid' );
-		$title = $this->context->request->getVal( 'title' );
+		$request = $this->context->getRequest();
+		$curid = $request->getInt( 'curid' );
+		$title = $request->getVal( 'title' );
 
-		if ( $this->context->request->getCheck( 'search' ) ) {
+		if ( $request->getCheck( 'search' ) ) {
 			// Compatibility with old search URLs which didn't use Special:Search
 			// Just check for presence here, so blank requests still
 			// show the search page when using ugly URLs (bug 8054).
@@ -57,8 +58,8 @@ class MediaWiki {
 		// For non-special titles, check for implicit titles
 		if ( is_null( $ret ) || $ret->getNamespace() != NS_SPECIAL ) {
 			// We can have urls with just ?diff=,?oldid= or even just ?diff=
-			$oldid = $this->context->request->getInt( 'oldid' );
-			$oldid = $oldid ? $oldid : $this->context->request->getInt( 'diff' );
+			$oldid = $request->getInt( 'oldid' );
+			$oldid = $oldid ? $oldid : $request->getInt( 'diff' );
 			// Allow oldid to override a changed or missing title
 			if ( $oldid ) {
 				$rev = Revision::newFromId( $oldid );
@@ -344,7 +345,7 @@ class MediaWiki {
 		} else {
 			$n = intval( $wgJobRunRate );
 		}
-		
+
 		// Close the session so that jobs don't access the current session
 		$this->shutdownLBFactory();
 		session_write_close();
@@ -375,7 +376,7 @@ class MediaWiki {
 	}
 
 	/**
-	 * Commit pending master changes, shutdown the current loadbalancer 
+	 * Commit pending master changes, shutdown the current loadbalancer
 	 * factory and destroys the factory instance.
 	 */
 	private function shutdownLBFactory() {