From 40469f56bd4afa47a58a10780978c4390f0a2d72 Mon Sep 17 00:00:00 2001 From: Tim Starling Date: Wed, 8 Feb 2012 05:25:19 +0000 Subject: [PATCH] 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. --- includes/User.php | 1 + 1 file changed, 1 insertion(+) diff --git a/includes/User.php b/includes/User.php index 9b6f4e7d19..c56e2ffdee 100644 --- a/includes/User.php +++ b/includes/User.php @@ -3997,6 +3997,7 @@ class User { __METHOD__ ); + $this->mOptionOverrides = array(); foreach ( $res as $row ) { $this->mOptionOverrides[$row->up_property] = $row->up_value; $this->mOptions[$row->up_property] = $row->up_value; -- 2.20.1