From: Happy-melon <happy-melon@users.mediawiki.org>
Date: Sat, 12 Sep 2009 21:41:09 +0000 (+0000)
Subject: Fix fatal left over from preferences rewrite, that no one noticed because this partic... 
X-Git-Tag: 1.31.0-rc.0~39763
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=53671b7d6d49ac8794c31b38f6654e6acf859e03;p=lhc%2Fweb%2Fwiklou.git

Fix fatal left over from preferences rewrite, that no one noticed because this particular function isn't used *anywhere* in core... :D
---

diff --git a/includes/User.php b/includes/User.php
index df95f3faa0..653b526c9a 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -2483,7 +2483,7 @@ class User {
 		$user = new User;
 		$user->load();
 		if ( isset( $params['options'] ) ) {
-			$user->mOptions = $params['options'] + $user->mOptions;
+			$user->mOptions = $params['options'] + (array)$user->mOptions;
 			unset( $params['options'] );
 		}
 		$dbw = wfGetDB( DB_MASTER );