Revert r43592 "Pass the user object in MakeGlobalVariablesScript in case some variabl...

As a UI thingy, $wgUser will be the only relevant user object here; there's no circumstance in which we might pass some other user object. No reason to pass it to hooks just on the off chance that they might use it, then...

diff --git a/docs/hooks.txt b/docs/hooks.txt
index 89d1cd2..4fe332c 100644 (file)
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -889,7 +889,6 @@ $variableIDs: array of strings
 'MakeGlobalVariablesScript': called right before Skin::makeVariablesScript is executed   
 &$vars: variable (or multiple variables) to be added into the output   
                of Skin::makeVariablesScript
-&$wgUser: user (object) currently loading the skin
 
 'MarkPatrolled': before an edit is marked patrolled
 $rcid: ID of the revision to be marked patrolled

diff --git a/includes/Skin.php b/includes/Skin.php
index 8bb0f41..1da33ec 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -409,7 +409,7 @@ class Skin extends Linker {
                        $vars['wgAjaxWatch'] = $msgs;
                }
 
-               wfRunHooks('MakeGlobalVariablesScript', array( &$vars, &$wgUser ) );
+               wfRunHooks('MakeGlobalVariablesScript', array(&$vars));
 
                return self::makeVariablesScript( $vars );
        }