http://www.mediawiki.org/wiki/Special:Code/MediaWiki/99684
Revision: 99684
Author: junaidpv
Date: 2011-10-13 14:55:57 +0000 (Thu, 13 Oct 2011)
Log Message:
-----------
Narayam: Revert r99310 and r99311.
Modified Paths:
--------------
trunk/extensions/Narayam/Narayam.hooks.php
trunk/extensions/Narayam/Narayam.php
Modified: trunk/extensions/Narayam/Narayam.hooks.php
===================================================================
--- trunk/extensions/Narayam/Narayam.hooks.php 2011-10-13 14:40:50 UTC (rev
99683)
+++ trunk/extensions/Narayam/Narayam.hooks.php 2011-10-13 14:55:57 UTC (rev
99684)
@@ -53,19 +53,10 @@
/**
* Get the available schemes for the user and content language
- * and mandatory schemes for the languages specifed, if any.
* @return array( scheme name => module name )
*/
protected static function getSchemes() {
global $wgLanguageCode, $wgLang, $wgNarayamSchemes;
- global $wgNarayamAlwaysLoadForLanguages;
-
- $mandatorySchemes = array ();
- foreach ($wgNarayamAlwaysLoadForLanguages as $languageCode) {
- if ( isset( $wgNarayamSchemes[$languageCode] ) ) {
- $mandatorySchemes +=
$wgNarayamSchemes[$languageCode];
- }
- }
$userlangCode = $wgLang->getCode();
$contlangSchemes = isset( $wgNarayamSchemes[$wgLanguageCode] ) ?
@@ -73,7 +64,7 @@
$userlangSchemes = isset( $wgNarayamSchemes[$userlangCode] ) ?
$wgNarayamSchemes[$userlangCode] : array();
- return $mandatorySchemes + $userlangSchemes + $contlangSchemes;
+ return $userlangSchemes + $contlangSchemes;
}
public static function addPreference( $user, &$preferences ) {
Modified: trunk/extensions/Narayam/Narayam.php
===================================================================
--- trunk/extensions/Narayam/Narayam.php 2011-10-13 14:40:50 UTC (rev
99683)
+++ trunk/extensions/Narayam/Narayam.php 2011-10-13 14:55:57 UTC (rev
99684)
@@ -41,9 +41,6 @@
'key' => 'm'
);
-// Schemes for the languages specified in this arrays will be loaded always
-$wgNarayamAlwaysLoadForLanguages = array();
-
// Array mapping language codes and scheme names to module names
// Custom schemes can be added here
$wgNarayamSchemes = array(
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
