From: Niklas Laxström <nikerabbit@users.mediawiki.org>
Date: Mon, 2 Apr 2007 14:37:47 +0000 (+0000)
Subject: * Try harder
X-Git-Tag: 1.31.0-rc.0~53496
X-Git-Url: http://git.cyclocoop.org/%22.%28%24lien.?a=commitdiff_plain;h=231994eab9c9a4ca594f113a56e2cd5a0e77ef25;p=lhc%2Fweb%2Fwiklou.git

* Try harder
---

diff --git a/maintenance/language/checkExtensioni18n.php b/maintenance/language/checkExtensioni18n.php
index fda023b6e2..dd5ed521bb 100644
--- a/maintenance/language/checkExtensioni18n.php
+++ b/maintenance/language/checkExtensioni18n.php
@@ -40,10 +40,8 @@ define( 'EXT_I18N_DB', 'i18n.db' );
 $wgDisplayLevel = 2;
 $wgChecks = array( 'untranslated', 'obsolete', 'variables', 'empty', 'whitespace', 'xhtml', 'chars' );
 
-
 $optionsWithArgs = array( 'extdir' );
 
-
 require_once( dirname(__FILE__).'/../commandLine.inc' );
 require_once( 'languages.inc' );
 require_once( 'checkLanguage.inc' );
@@ -57,37 +55,47 @@ class extensionLanguages extends languages {
 		$this->mExt18nFilename = $ext18nFilename;
 		$this->mExtArrayName = $extArrayName;
 
-		$this->mIgnoredMessages = array() ;
-		$this->mOptionalMessages = array() ;
+		$this->mIgnoredMessages = array();
+		$this->mOptionalMessages = array();
 
 		if ( file_exists( $this->mExt18nFilename ) ) {
 			require_once( $this->mExt18nFilename );
 
-			$foundarray = false ;
-
+			$foundarray = false;
 			if( isset( ${$this->mExtArrayName} ) )  {
 				// File provided in the db file
-				$foundarray = ${$this->mExtArrayName} ;
+				$foundarray = ${$this->mExtArrayName};
 			} else {
-				// Provided array could not be found we try to guess it.
-
-				# Using the extension path ($m[1]) and filename ($m[2]):
-				$m = array();
-				preg_match( '%.*/(.*)/(.*).i18n\.php%', $this->mExt18nFilename, $m);
-				$arPathCandidate = 'wg' . $m[1].'Messages';
-				$arFileCandidate = 'wg' . $m[2].'Messages';
-				$funcCandidate = "ef{$m[2]}Messages";
-
-				// Try them:
-				if( isset($$arPathCandidate) && is_array( $$arPathCandidate ) ) {
-					print "warning> messages from guessed path array \$$arPathCandidate.\n";
-					$foundarray = $$arPathCandidate;
-				} elseif( isset($$arFileCandidate) && is_array( $$arFileCandidate ) ) {
-					print "warning> messages from guessed file array \$$arFileCandidate.\n";
-					$foundarray = $$arFileCandidate;
-				} elseif( function_exists( $funcCandidate ) ) {
-					print "warning> messages build from guessed function {$funcCandidate}().\n";
-					$foundarray = $funcCandidate();
+
+				/* For extensions included elsewhere. For some reason other extensions
+				 * break with the global statement, so recheck here.
+				 */
+				global ${$this->mExtArrayName};
+				if( isset( ${$this->mExtArrayName} ) )  {
+					$foundarray = ${$this->mExtArrayName};
+				}
+
+				if(!$foundarray) {
+					// Provided array could not be found we try to guess it.
+
+					# Using the extension path ($m[1]) and filename ($m[2]):
+					$m = array();
+					preg_match( '%.*/(.*)/(.*).i18n\.php%', $this->mExt18nFilename, $m);
+					$arPathCandidate = 'wg' . $m[1].'Messages';
+					$arFileCandidate = 'wg' . $m[2].'Messages';
+					$funcCandidate = "ef{$m[2]}Messages";
+
+					// Try them:
+					if( isset($$arPathCandidate) && is_array( $$arPathCandidate ) ) {
+						print "warning> messages from guessed path array \$$arPathCandidate.\n";
+						$foundarray = $$arPathCandidate;
+					} elseif( isset($$arFileCandidate) && is_array( $$arFileCandidate ) ) {
+						print "warning> messages from guessed file array \$$arFileCandidate.\n";
+						$foundarray = $$arFileCandidate;
+					} elseif( function_exists( $funcCandidate ) ) {
+						print "warning> messages build from guessed function {$funcCandidate}().\n";
+						$foundarray = $funcCandidate();
+					}
 				}
 
 				# We are unlucky, return empty stuff