From 53671b7d6d49ac8794c31b38f6654e6acf859e03 Mon Sep 17 00:00:00 2001
From: Happy-melon <happy-melon@users.mediawiki.org>
Date: Sat, 12 Sep 2009 21:41:09 +0000
Subject: [PATCH] Fix fatal left over from preferences rewrite, that no one
 noticed because this particular function isn't used *anywhere* in core... :D

---
 includes/User.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 );
-- 
2.20.1