From: Sam Reed <reedy@users.mediawiki.org>
Date: Sun, 28 Nov 2010 16:04:48 +0000 (+0000)
Subject: Fix 1 deprecated method call in SpecialPage, and 3 non static methods called statically
X-Git-Tag: 1.31.0-rc.0~33706
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/modifier.php?a=commitdiff_plain;h=c14037a2e047491e4731f6efe1c82b83e1183471;p=lhc%2Fweb%2Fwiklou.git

Fix 1 deprecated method call in SpecialPage, and 3 non static methods called statically
---

diff --git a/includes/SpecialPage.php b/includes/SpecialPage.php
index 5befe98eb3..35890dcbc4 100644
--- a/includes/SpecialPage.php
+++ b/includes/SpecialPage.php
@@ -573,7 +573,7 @@ class SpecialPage {
 		$page->including( $including );
 
 		// Execute special page
-		$profName = 'Special:' . $page->getName();
+		$profName = 'Special:' . $page->name();
 		wfProfileIn( $profName );
 		$page->execute( $par );
 		wfProfileOut( $profName );
diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index ae5e89199c..a768585a5d 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -354,7 +354,7 @@ class Parser {
 		$uniq_prefix = $this->mUniqPrefix;
 		$matches = array();
 		$elements = array_keys( $this->mTransparentTagHooks );
-		$text = self::extractTagsAndParams( $elements, $text, $matches, $uniq_prefix );
+		$text = $this->extractTagsAndParams( $elements, $text, $matches, $uniq_prefix );
 
 		foreach ( $matches as $marker => $data ) {
 			list( $element, $content, $params, $tag ) = $data;
diff --git a/includes/upload/UploadStash.php b/includes/upload/UploadStash.php
index e76c40393c..94496d3598 100644
--- a/includes/upload/UploadStash.php
+++ b/includes/upload/UploadStash.php
@@ -308,7 +308,7 @@ class UploadStashFile extends UnregisteredLocalFile {
 	 * @return String: URL to access thumbnail, or URL with partial path
 	 */
 	public function getThumbUrl( $thumbName = false ) { 
-		return self::getSpecialUrl( $thumbName );
+		return $this->getSpecialUrl( $thumbName );
 	}
 
 	/** 
@@ -332,7 +332,7 @@ class UploadStashFile extends UnregisteredLocalFile {
 	 */
 	public function getUrl() {
 		if ( !isset( $this->url ) ) {
-			$this->url = self::getSpecialUrl( $this->getUrlName() );
+			$this->url = $this->getSpecialUrl( $this->getUrlName() );
 		}
 		return $this->url;
 	}