MediaWiki 1.17.3

[autoinstallsdev/mediawiki.git] / includes / resourceloader / ResourceLoaderUserOptionsModule.php

diff --git a/includes/resourceloader/ResourceLoaderUserOptionsModule.php b/includes/resourceloader/ResourceLoaderUserOptionsModule.php
index 61c769400d0cb7725d497fce735d2468d1f84eb9..fb33cd1f0c2f4597aed0e7b4a72e1c5c757d77f5 100644 (file)
--- a/includes/resourceloader/ResourceLoaderUserOptionsModule.php
+++ b/includes/resourceloader/ResourceLoaderUserOptionsModule.php
@@ -39,41 +39,20 @@ class ResourceLoaderUserOptionsModule extends ResourceLoaderModule {
 
                global $wgUser;
 
-               if ( $context->getUser() === $wgUser->getName() ) {
-                       return $this->modifiedTime[$hash] = wfTimestamp( TS_UNIX, $wgUser->getTouched() );
-               } else {
-                       return 1;
-               }
-       }
-
-       /**
-        * Fetch the context's user options, or if it doesn't match current user,
-        * the default options.
-        * 
-        * @param $context ResourceLoaderContext: Context object
-        * @return Array: List of user options keyed by option name
-        */
-       protected function contextUserOptions( ResourceLoaderContext $context ) {
-               global $wgUser;
-
-               // Verify identity -- this is a private module
-               if ( $context->getUser() === $wgUser->getName() ) {
-                       return $wgUser->getOptions();
-               } else {
-                       return User::getDefaultOptions();
-               }
+               return $this->modifiedTime[$hash] = wfTimestamp( TS_UNIX, $wgUser->getTouched() );
        }
 
        public function getScript( ResourceLoaderContext $context ) {
+               global $wgUser;
                return Xml::encodeJsCall( 'mediaWiki.user.options.set', 
-                       array( $this->contextUserOptions( $context ) ) );
+                       array( $wgUser->getOptions() ) );
        }
 
        public function getStyles( ResourceLoaderContext $context ) {
-               global $wgAllowUserCssPrefs;
+               global $wgAllowUserCssPrefs, $wgUser;
 
                if ( $wgAllowUserCssPrefs ) {
-                       $options = $this->contextUserOptions( $context );
+                       $options = $wgUser->getOptions();
 
                        // Build CSS rules
                        $rules = array();