Fix fatal left over from preferences rewrite, that no one noticed because this partic...

diff --git a/includes/User.php b/includes/User.php
index df95f3f..653b526 100644 (file)
--- 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 );