dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Upstream "pulsating dot" widget from VE"
[lhc/web/wiklou.git]
/
includes
/
preferences
/
DefaultPreferencesFactory.php
diff --git
a/includes/preferences/DefaultPreferencesFactory.php
b/includes/preferences/DefaultPreferencesFactory.php
index
001c975
..
00c2903
100644
(file)
--- a/
includes/preferences/DefaultPreferencesFactory.php
+++ b/
includes/preferences/DefaultPreferencesFactory.php
@@
-232,7
+232,10
@@
class DefaultPreferencesFactory implements PreferencesFactory {
} elseif ( $field->validate( $globalDefault, $user->getOptions() ) === true ) {
$info['default'] = $globalDefault;
} else {
} elseif ( $field->validate( $globalDefault, $user->getOptions() ) === true ) {
$info['default'] = $globalDefault;
} else {
- throw new MWException( "Global default '$globalDefault' is invalid for field $name" );
+ $globalDefault = json_encode( $globalDefault );
+ throw new MWException(
+ "Default '$globalDefault' is invalid for preference $name of user $user"
+ );
}
}
}
}