From: Sam Reed <reedy@users.mediawiki.org>
Date: Sun, 25 Jul 2010 21:15:27 +0000 (+0000)
Subject: A few more wrong static things
X-Git-Tag: 1.31.0-rc.0~35925
X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=f4f5d171055d72d94bfcac5c0e8c3f087a676cc6;p=lhc%2Fweb%2Fwiklou.git

A few more wrong static things

Remove some =& from LanguageKk_cyrl
---

diff --git a/includes/filerepo/FileRepo.php b/includes/filerepo/FileRepo.php
index 6b85dd6b56..4d31a1ad78 100644
--- a/includes/filerepo/FileRepo.php
+++ b/includes/filerepo/FileRepo.php
@@ -378,7 +378,7 @@ abstract class FileRepo {
 	 */
 	function getDescriptionStylesheetUrl() {
 		if ( $this->scriptDirUrl ) {
-			return self::makeUrl( 'title=MediaWiki:Filepage.css&' .
+			return $this->makeUrl( 'title=MediaWiki:Filepage.css&' .
 				wfArrayToCGI( Skin::getDynamicStylesheetQuery() ) );
 		}
 	}
diff --git a/includes/json/Services_JSON.php b/includes/json/Services_JSON.php
index 453b01eeff..098455d5c5 100644
--- a/includes/json/Services_JSON.php
+++ b/includes/json/Services_JSON.php
@@ -431,7 +431,7 @@ class Services_JSON
 					$this->indent--;
 
 					foreach($properties as $property) {
-						if(Services_JSON::isError($property)) {
+						if($this->isError($property)) {
 							return $property;
 						}
 					}
@@ -445,7 +445,7 @@ class Services_JSON
 				$this->indent--;
 
 				foreach($elements as $element) {
-					if(Services_JSON::isError($element)) {
+					if($this->isError($element)) {
 						return $element;
 					}
 				}
@@ -462,7 +462,7 @@ class Services_JSON
 				$this->indent--;
 
 				foreach($properties as $property) {
-					if(Services_JSON::isError($property)) {
+					if($this->isError($property)) {
 						return $property;
 					}
 				}
@@ -489,7 +489,7 @@ class Services_JSON
 	{
 		$encoded_value = $this->encode2($value);
 
-		if(Services_JSON::isError($encoded_value)) {
+		if($this->isError($encoded_value)) {
 			return $encoded_value;
 		}
 
diff --git a/includes/parser/Preprocessor_DOM.php b/includes/parser/Preprocessor_DOM.php
index 60f975df85..f0f056e495 100644
--- a/includes/parser/Preprocessor_DOM.php
+++ b/includes/parser/Preprocessor_DOM.php
@@ -1263,7 +1263,8 @@ class PPTemplateFrame_DOM extends PPFrame_DOM {
 	var $numberedExpansionCache, $namedExpansionCache;
 
 	function __construct( $preprocessor, $parent = false, $numberedArgs = array(), $namedArgs = array(), $title = false ) {
-		PPFrame_DOM::__construct( $preprocessor );
+		parent::__construct( $preprocessor );
+
 		$this->parent = $parent;
 		$this->numberedArgs = $numberedArgs;
 		$this->namedArgs = $namedArgs;
@@ -1375,7 +1376,7 @@ class PPCustomFrame_DOM extends PPFrame_DOM {
 	var $args;
 
 	function __construct( $preprocessor, $args ) {
-		PPFrame_DOM::__construct( $preprocessor );
+		parent::__construct( $preprocessor );
 		$this->args = $args;
 	}
 
diff --git a/includes/parser/Preprocessor_Hash.php b/includes/parser/Preprocessor_Hash.php
index 3fd06c125f..9cb61e6239 100644
--- a/includes/parser/Preprocessor_Hash.php
+++ b/includes/parser/Preprocessor_Hash.php
@@ -1213,7 +1213,8 @@ class PPTemplateFrame_Hash extends PPFrame_Hash {
 	var $numberedExpansionCache, $namedExpansionCache;
 
 	function __construct( $preprocessor, $parent = false, $numberedArgs = array(), $namedArgs = array(), $title = false ) {
-		PPFrame_Hash::__construct( $preprocessor );
+		parent::__construct( $preprocessor );
+
 		$this->parent = $parent;
 		$this->numberedArgs = $numberedArgs;
 		$this->namedArgs = $namedArgs;
@@ -1325,7 +1326,7 @@ class PPCustomFrame_Hash extends PPFrame_Hash {
 	var $args;
 
 	function __construct( $preprocessor, $args ) {
-		PPFrame_Hash::__construct( $preprocessor );
+		parent::__construct( $preprocessor );
 		$this->args = $args;
 	}
 
diff --git a/languages/classes/LanguageKk_cyrl.php b/languages/classes/LanguageKk_cyrl.php
index 1d52c63734..d57d58d53b 100644
--- a/languages/classes/LanguageKk_cyrl.php
+++ b/languages/classes/LanguageKk_cyrl.php
@@ -477,9 +477,9 @@ class LanguageKk_cyrl extends Language {
 		$secondPerson = array( "ز" ); // 1st plural, 2nd formal
 		$thirdPerson = array( "ى", "ٸ" ); // 3rd
 
-		$lastLetter = self::lastLetter( $word, $allVowels );
-		$wordEnding =& $lastLetter[0];
-		$wordLastVowel =& $lastLetter[1];
+		$lastLetter = $this->lastLetter( $word, $allVowels );
+		$wordEnding = $lastLetter[0];
+		$wordLastVowel = $lastLetter[1];
 
 		// Now convert the word
 		switch ( $case ) {