From: Niklas Laxström <nikerabbit@users.mediawiki.org>
Date: Sat, 2 Oct 2010 16:11:44 +0000 (+0000)
Subject: Fix personal user styles being broken since introduction in r73024
X-Git-Tag: 1.31.0-rc.0~34675
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=e5ee3055cdd1bebdc35c80429b8efaa3068ffc57;p=lhc%2Fweb%2Fwiklou.git

Fix personal user styles being broken since introduction in r73024
---

diff --git a/includes/ResourceLoaderModule.php b/includes/ResourceLoaderModule.php
index 13de97bc8c..7ca72a11ec 100644
--- a/includes/ResourceLoaderModule.php
+++ b/includes/ResourceLoaderModule.php
@@ -933,9 +933,9 @@ class ResourceLoaderUserOptionsModule extends ResourceLoaderModule {
 		if ( $wgAllowUserCssPrefs ) {
 			// Verify identity -- this is a private module
 			if ( $context->getUser() === $wgUser->getName() ) {
-				$options = FormatJson::encode( $wgUser->getOptions() );
+				$options = $wgUser->getOptions();
 			} else {
-				$options = FormatJson::encode( User::getDefaultOptions() );
+				$options = User::getDefaultOptions();
 			}
 
 			// Build CSS rules