From: Sam Reed <reedy@users.mediawiki.org>
Date: Sun, 25 Jul 2010 18:00:32 +0000 (+0000)
Subject: Fix some wrong usages of static method calls (actually belong to class instance)
X-Git-Tag: 1.31.0-rc.0~35946
X-Git-Url: https://git.cyclocoop.org/%7B%7B%20url_for%28?a=commitdiff_plain;h=6afa6c6ab59ec2c938e6c1db5ba0218387571f03;p=lhc%2Fweb%2Fwiklou.git

Fix some wrong usages of static method calls (actually belong to class instance)
---

diff --git a/includes/ZhClient.php b/includes/ZhClient.php
index 61faa8df71..a029be1528 100644
--- a/includes/ZhClient.php
+++ b/includes/ZhClient.php
@@ -123,7 +123,7 @@ class ZhClient {
 		$q = "SEG $len\n$text";
 		$result = $this->query($q);
 		if(!$result) {// fallback to character based segmentation
-			$result = ZhClientFake::segment($text);
+			$result = $this->segment($text);
 		}
 		return $result;
 	}
diff --git a/languages/classes/LanguageKk_cyrl.php b/languages/classes/LanguageKk_cyrl.php
index e0a1b12559..8eb35b78e4 100644
--- a/languages/classes/LanguageKk_cyrl.php
+++ b/languages/classes/LanguageKk_cyrl.php
@@ -37,7 +37,7 @@ class LanguageKk_cyrl extends Language {
 		$secondPerson = array( "з" ); // 1st plural, 2nd formal
 		$thirdPerson = array( "ы", "і" ); // 3rd
 
-		$lastLetter = self::lastLetter( $word, $allVowels );
+		$lastLetter = $this->lastLetter( $word, $allVowels );
 		$wordEnding =& $lastLetter[0];
 		$wordLastVowel =& $lastLetter[1];
 
diff --git a/languages/classes/LanguageZh_hans.php b/languages/classes/LanguageZh_hans.php
index d93404ac0b..9ea51def3d 100644
--- a/languages/classes/LanguageZh_hans.php
+++ b/languages/classes/LanguageZh_hans.php
@@ -25,7 +25,7 @@ class LanguageZh_hans extends Language {
 		// Double-width roman characters
 		$s = parent::normalizeForSearch( $s );
 		$s = trim( $s );
-		$s = self::segmentByWord( $s );
+		$s = $this->segmentByWord( $s );
 
 		wfProfileOut( __METHOD__ );
 		return $s;
diff --git a/maintenance/checkSyntax.php b/maintenance/checkSyntax.php
index d70545f506..02b5a691ce 100644
--- a/maintenance/checkSyntax.php
+++ b/maintenance/checkSyntax.php
@@ -121,7 +121,7 @@ class CheckSyntax extends Maintenance {
 
 			preg_match_all( '/^\s*[AM].{7}(.*?)\r?$/m', $output, $matches );
 			foreach ( $matches[1] as $file ) {
-				if ( self::isSuitableFile( $file ) && !is_dir( $file ) ) {
+				if ( $this->isSuitableFile( $file ) && !is_dir( $file ) ) {
 					$this->mFiles[] = $file;
 				}
 			}
diff --git a/maintenance/installExtension.php b/maintenance/installExtension.php
index 5600dbec20..17b50c985d 100644
--- a/maintenance/installExtension.php
+++ b/maintenance/installExtension.php
@@ -414,7 +414,7 @@ class ExtensionInstaller {
 
 		foreach ( $ff as $f ) {
 			if ( is_dir( $f ) && !is_link( $f ) ) {
-				$ok = ExtensionInstaller::copyDir( $f, $d );
+				$ok = $this->copyDir( $f, $d );
 				if ( !$ok ) return false;
 			}
 			else {
@@ -444,7 +444,7 @@ class ExtensionInstaller {
 			if ( is_link( $f ) ) continue; # skip link
 
 			if ( is_dir( $f ) ) {
-				ExtensionInstaller::setPermissions( $f, $dirbits, $filebits );
+				$this->setPermissions( $f, $dirbits, $filebits );
 			}
 			else {
 				if ( !chmod( $f, $filebits ) ) ExtensionInstaller::warn( "faield to set permissions for $f" );