http://www.mediawiki.org/wiki/Special:Code/MediaWiki/73040
Revision: 73040
Author: tparscal
Date: 2010-09-15 01:46:19 +0000 (Wed, 15 Sep 2010)
Log Message:
-----------
Fixed a bunch of syntax errors and mistakes.
Modified Paths:
--------------
trunk/extensions/Vector/Vector.hooks.php
trunk/phase3/includes/ResourceLoader.php
trunk/phase3/resources/Resources.php
Modified: trunk/extensions/Vector/Vector.hooks.php
===================================================================
--- trunk/extensions/Vector/Vector.hooks.php 2010-09-15 01:38:57 UTC (rev
73039)
+++ trunk/extensions/Vector/Vector.hooks.php 2010-09-15 01:46:19 UTC (rev
73040)
@@ -20,7 +20,7 @@
'vector-collapsiblenav-more',
),
'dependencies' => array( 'jquery.client' ),
- )
+ ),
'preferences' => array(
'key' => 'vector-collapsiblenav',
'ui' => array(
@@ -38,7 +38,7 @@
'name' => 'vector.collapsibleTabs',
'resources' => array(
'scripts' =>
'extensions/Vector/modules/vector.collapsibleTabs.js',
- )
+ ),
),
'editwarning' => array(
'name' => 'vector.editWarning',
@@ -66,7 +66,7 @@
'dependencies' => array( 'jquery.client' ),
),
'preferences' => array(
- 'requirements' = array( 'vector-simplesearch'
=> true ),
+ 'requirements' => array( 'vector-simplesearch'
=> true ),
),
),
'footercleanup' => array(
@@ -86,14 +86,14 @@
),
),
'preferences' => array(
- 'requirements' = array( 'vector-simplesearch'
=> true, 'disablesuggest' => false ),
+ 'requirements' => array( 'vector-simplesearch'
=> true, 'disablesuggest' => false ),
),
),
);
/* Protected Static Methods */
- protected static isEnabled( $module ) {
+ protected static function isEnabled( $module ) {
global $wgVectorModules, $wgUser;
$enabled =
@@ -101,15 +101,17 @@
(
$wgVectorModules[$module]['user'] &&
isset(
self::$modules[$module]['preferences']['key'] ) &&
- $wgUser->getOption(
self::$modules[$module]['preferences']['key']
+ $wgUser->getOption(
self::$modules[$module]['preferences']['key'] )
);
if ( !$enabled ) {
return false;
}
- foreach (
self::$modules[$module]['preferences']['requirements'] as $requirement =>
$value ) {
- // Important! We really do want fuzzy evaluation here
- if ( $wgUser->getOption( $requirement ) != $value ) {
- return false;
+ if ( isset(
self::$modules[$module]['preferences']['requirements'] ) ) {
+ foreach (
self::$modules[$module]['preferences']['requirements'] as $requirement =>
$value ) {
+ // Important! We really do want fuzzy
evaluation here
+ if ( $wgUser->getOption( $requirement ) !=
$value ) {
+ return false;
+ }
}
}
return true;
@@ -139,6 +141,7 @@
$out->addModules(
self::$modules[$module]['name'] );
}
}
+ return true;
}
/**
@@ -153,7 +156,7 @@
global $wgVectorModules;
foreach ( $wgVectorModules as $module => $enable ) {
- if ( $enable['user'] ) && isset(
self::$modules['preferences'][$module]['ui'] ) ) {
+ if ( $enable['user'] && isset(
self::$modules['preferences'][$module]['ui'] ) ) {
$defaultPreferences[self::$modules['preferences'][$module]['key']] =
self::$modules['preferences'][$module]['ui'];
}
@@ -166,6 +169,8 @@
* Adds enabled/disabled switches for Vector modules
*/
public static function makeGlobalVariablesScript( &$vars ) {
+ global $wgVectorModules;
+
$configurations = array();
foreach ( $wgVectorModules as $module => $enable ) {
if (
@@ -191,7 +196,8 @@
*/
public static function resourceLoaderRegisterModules() {
foreach ( self::$modules as $module ) {
- ResourceLoader::register( $module['name'],
$module['resources'] );
+ ResourceLoader::register( $module['name'], new
ResourceLoaderFileModule( $module['resources'] ) );
}
+ return true;
}
}
\ No newline at end of file
Modified: trunk/phase3/includes/ResourceLoader.php
===================================================================
--- trunk/phase3/includes/ResourceLoader.php 2010-09-15 01:38:57 UTC (rev
73039)
+++ trunk/phase3/includes/ResourceLoader.php 2010-09-15 01:46:19 UTC (rev
73040)
@@ -326,4 +326,4 @@
}
ResourceLoader::register( include( "$IP/resources/Resources.php" ) );
-wfRunHook( 'ResourceLoaderRegisterModules' );
\ No newline at end of file
+wfRunHooks( 'ResourceLoaderRegisterModules' );
\ No newline at end of file
Modified: trunk/phase3/resources/Resources.php
===================================================================
--- trunk/phase3/resources/Resources.php 2010-09-15 01:38:57 UTC (rev
73039)
+++ trunk/phase3/resources/Resources.php 2010-09-15 01:46:19 UTC (rev
73040)
@@ -405,4 +405,4 @@
'mediawiki.legacy.wikiprintable' => new ResourceLoaderFileModule( array(
'styles' => array( 'skins/common/wikiprintable.css' => array(
'media' => 'print' ) ),
) ),
-) );
\ No newline at end of file
+);
\ No newline at end of file
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
