http://www.mediawiki.org/wiki/Special:Code/MediaWiki/74145
Revision: 74145
Author: nikerabbit
Date: 2010-10-02 16:11:44 +0000 (Sat, 02 Oct 2010)
Log Message:
-----------
Fix personal user styles being broken since introduction in r73024
Modified Paths:
--------------
trunk/phase3/includes/ResourceLoaderModule.php
Modified: trunk/phase3/includes/ResourceLoaderModule.php
===================================================================
--- trunk/phase3/includes/ResourceLoaderModule.php 2010-10-02 15:59:21 UTC
(rev 74144)
+++ trunk/phase3/includes/ResourceLoaderModule.php 2010-10-02 16:11:44 UTC
(rev 74145)
@@ -933,9 +933,9 @@
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
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
