https://www.mediawiki.org/wiki/Special:Code/MediaWiki/103454
Revision: 103454
Author: nikerabbit
Date: 2011-11-17 10:50:29 +0000 (Thu, 17 Nov 2011)
Log Message:
-----------
Partially get rid of globs
Modified Paths:
--------------
trunk/extensions/Narayam/Narayam.hooks.php
Modified: trunk/extensions/Narayam/Narayam.hooks.php
===================================================================
--- trunk/extensions/Narayam/Narayam.hooks.php 2011-11-17 10:50:08 UTC (rev
103453)
+++ trunk/extensions/Narayam/Narayam.hooks.php 2011-11-17 10:50:29 UTC (rev
103454)
@@ -9,10 +9,7 @@
/// Hook: BeforePageDisplay
public static function addModules( $out, $skin ) {
- global $wgUser;
-
- if ( $wgUser->getOption( 'narayamDisable' ) ) {
- // User disabled Narayam
+ if ( $out->getUser()->getOption( 'narayamDisable' ) ) {
return true;
}
@@ -28,17 +25,9 @@
/// Hook: ResourceLoaderGetConfigVars
public static function addConfig( &$vars ) {
- global $wgNarayamEnabledByDefault, $wgNarayamRecentItemsLength,
$wgUser;
-
- // FIXME: this hook cannot depend on any state!
- if ( $wgUser->getOption( 'narayamDisable' ) ) {
- // User disabled Narayam
- return true;
- }
-
+ global $wgNarayamRecentItemsLength, $wgNarayamEnabledByDefault;
$vars['wgNarayamEnabledByDefault'] = $wgNarayamEnabledByDefault;
$vars['wgNarayamRecentItemsLength'] =
$wgNarayamRecentItemsLength;
-
return true;
}
@@ -47,7 +36,6 @@
global $wgUser, $wgNarayamSchemes;
if ( $wgUser->getOption( 'narayamDisable' ) ) {
- // User disabled Narayam
return true;
}
@@ -86,4 +74,5 @@
return true;
}
+
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
