http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56249
Revision: 56249
Author: happy-melon
Date: 2009-09-12 21:41:09 +0000 (Sat, 12 Sep 2009)
Log Message:
-----------
Fix fatal left over from preferences rewrite, that no one noticed because this
particular function isn't used *anywhere* in core... :D
Modified Paths:
--------------
trunk/phase3/includes/User.php
Modified: trunk/phase3/includes/User.php
===================================================================
--- trunk/phase3/includes/User.php 2009-09-12 21:40:28 UTC (rev 56248)
+++ trunk/phase3/includes/User.php 2009-09-12 21:41:09 UTC (rev 56249)
@@ -2483,7 +2483,7 @@
$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 );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
