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 5befe98..35890dc 100644 (file)
--- 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 ae5e891..a768585 100644 (file)
--- 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 e76c403..94496d3 100644 (file)
--- 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;
        }