dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d5e6a79
)
Fix fatal left over from preferences rewrite, that no one noticed because this partic...
author
Happy-melon
<happy-melon@users.mediawiki.org>
Sat, 12 Sep 2009 21:41:09 +0000
(21:41 +0000)
committer
Happy-melon
<happy-melon@users.mediawiki.org>
Sat, 12 Sep 2009 21:41:09 +0000
(21:41 +0000)
includes/User.php
patch
|
blob
|
history
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 );