https://www.mediawiki.org/wiki/Special:Code/MediaWiki/110910

Revision: 110910
Author:   tstarling
Date:     2012-02-08 05:25:19 +0000 (Wed, 08 Feb 2012)
Log Message:
-----------
Fixed a bug in User::loadOptions(), probably introduced in r49925, causing the 
User::loadOptions() query to be done after a cache load if the user had no 
option overrides at the time of cache save. Store an empty array to the cache's 
mOptionOverrides instead of null.

Modified Paths:
--------------
    trunk/phase3/includes/User.php

Modified: trunk/phase3/includes/User.php
===================================================================
--- trunk/phase3/includes/User.php      2012-02-08 03:27:49 UTC (rev 110909)
+++ trunk/phase3/includes/User.php      2012-02-08 05:25:19 UTC (rev 110910)
@@ -3997,6 +3997,7 @@
                                __METHOD__
                        );
 
+                       $this->mOptionOverrides = array();
                        foreach ( $res as $row ) {
                                $this->mOptionOverrides[$row->up_property] = 
$row->up_value;
                                $this->mOptions[$row->up_property] = 
$row->up_value;


_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to