* (bug 34212) ApiBlock/ApiUnblock allow action to take place without a token paramete...

[lhc/web/wiklou.git] / includes / resourceloader / ResourceLoaderUserCSSPrefsModule.php

diff --git a/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php b/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php
index 80b767b..ccfc378 100644 (file)
--- a/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php
+++ b/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php
@@ -44,30 +44,7 @@ class ResourceLoaderUserCSSPrefsModule 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() );
        }
        
        /**
@@ -75,10 +52,10 @@ class ResourceLoaderUserCSSPrefsModule extends ResourceLoaderModule {
         * @return array
         */
        public function getStyles( ResourceLoaderContext $context ) {
-               global $wgAllowUserCssPrefs;
+               global $wgAllowUserCssPrefs, $wgUser;
 
                if ( $wgAllowUserCssPrefs ) {
-                       $options = $this->contextUserOptions( $context );
+                       $options = $wgUser->getOptions();
 
                        // Build CSS rules
                        $rules = array();