X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fresourceloader%2FResourceLoaderUserOptionsModule.php;h=933c55e821dc0a3ea1defe2591a1ec07f50e2994;hb=d05de487c31db528919e7ec7ac64b78bb33fb9e5;hp=1989353b79dcee5e2450e0eba7b0f1ad5a782035;hpb=192423c359f74f9350ac74b6c373a2a72000522a;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/resourceloader/ResourceLoaderUserOptionsModule.php b/includes/resourceloader/ResourceLoaderUserOptionsModule.php
index 1989353b79..933c55e821 100644
--- a/includes/resourceloader/ResourceLoaderUserOptionsModule.php
+++ b/includes/resourceloader/ResourceLoaderUserOptionsModule.php
@@ -44,30 +44,7 @@ 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() );
 	}
 
 	/**
@@ -75,56 +52,16 @@ class ResourceLoaderUserOptionsModule extends ResourceLoaderModule {
 	 * @return string
 	 */
 	public function getScript( ResourceLoaderContext $context ) {
-		return Xml::encodeJsCall( 'mw.user.options.set', 
-			array( $this->contextUserOptions( $context ) ) );
+		global $wgUser;
+		return Xml::encodeJsCall( 'mw.user.options.set',
+			array( $wgUser->getOptions() ) );
 	}
 
 	/**
-	 * @param $context ResourceLoaderContext
-	 * @return array
+	 * @return bool
 	 */
-	public function getStyles( ResourceLoaderContext $context ) {
-		// FIXME: This stuff should really be in its own module, because it gets double-loaded otherwise
-		// (once through a <link>, once when embedded as JS)
-		global $wgAllowUserCssPrefs;
-
-		if ( $wgAllowUserCssPrefs ) {
-			$options = $this->contextUserOptions( $context );
-
-			// Build CSS rules
-			$rules = array();
-
-			// Underline: 2 = browser default, 1 = always, 0 = never
-			if ( $options['underline'] < 2 ) {
-				$rules[] = "a { text-decoration: " . 
-					( $options['underline'] ? 'underline' : 'none' ) . "; }";
-			}
-			if ( $options['highlightbroken'] ) {
-				$rules[] = "a.new, #quickbar a.new { color: #ba0000; }\n";
-			} else {
-				$rules[] = "a.new, #quickbar a.new, a.stub, #quickbar a.stub { color: inherit; }";
-				$rules[] = "a.new:after, #quickbar a.new:after { content: '?'; color: #ba0000; }";
-				$rules[] = "a.stub:after, #quickbar a.stub:after { content: '!'; color: #772233; }";
-			}
-			if ( $options['justify'] ) {
-				$rules[] = "#article, #bodyContent, #mw_content { text-align: justify; }\n";
-			}
-			if ( !$options['showtoc'] ) {
-				$rules[] = "#toc { display: none; }\n";
-			}
-			if ( !$options['editsection'] ) {
-				$rules[] = ".editsection { display: none; }\n";
-			}
-			if ( $options['editfont'] !== 'default' ) {
-				$rules[] = "textarea { font-family: {$options['editfont']}; }\n";
-			}
-			$style = implode( "\n", $rules );
-			if ( $this->getFlip( $context ) ) {
-				$style = CSSJanus::transform( $style, true, false );
-			}
-			return array( 'all' => $style );
-		}
-		return array();
+	public function supportsURLLoading() {
+		return false;
 	}
 
 	/**
@@ -133,8 +70,4 @@ class ResourceLoaderUserOptionsModule extends ResourceLoaderModule {
 	public function getGroup() {
 		return 'private';
 	}
-	
-	public function getDependencies() {
-		return array( 'mediawiki.user' );
-	}
 }