http://www.mediawiki.org/wiki/Special:Code/MediaWiki/97469
Revision: 97469
Author: reedy
Date: 2011-09-19 11:31:12 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
Fix typo from r97461, was breaking unit tests
Modified Paths:
--------------
trunk/phase3/languages/Language.php
Modified: trunk/phase3/languages/Language.php
===================================================================
--- trunk/phase3/languages/Language.php 2011-09-19 11:21:59 UTC (rev 97468)
+++ trunk/phase3/languages/Language.php 2011-09-19 11:31:12 UTC (rev 97469)
@@ -438,7 +438,7 @@
return false;
} else {
// Check what is in i18n files
- $alises = self::$dataCache->getItem( $this->mCode,
'namespaceGenderAliases' );
+ $aliases = self::$dataCache->getItem( $this->mCode,
'namespaceGenderAliases' );
return count( $aliases ) > 0;
}
}
@@ -475,6 +475,7 @@
}
}
+ // <Nikerabbit> make $wgExtraNamespaces take precedence
over $namespaceGenderAliases when $wgExtraGenderNamespaces are not defined
global $wgExtraGenderNamespaces;
$genders = $wgExtraGenderNamespaces +
self::$dataCache->getItem( $this->mCode, 'namespaceGenderAliases' );
foreach ( $genders as $index => $forms ) {
@@ -535,12 +536,12 @@
* short names for language variants used for language conversion links.
*
* @param $code String
- * @param $usemsg Use the "variantname-xyz" message if it exists
+ * @param $usemsg bool Use the "variantname-xyz" message if it exists
* @return string
*/
function getVariantname( $code, $usemsg = true ) {
$msg = "variantname-$code";
- $codeArray = list( $rootCode ) = explode( '-', $code );
+ list( $rootCode ) = explode( '-', $code );
if( $usemsg && wfMessage( $msg )->exists() ) {
return $this->getMessageFromDB( $msg );
} elseif( $name = self::getLanguageName( $code ) ) {
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
