dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
4fa5f1b
)
Merge "Update User::getOption() PHPDoc"
author
jenkins-bot
<jenkins-bot@gerrit.wikimedia.org>
Thu, 12 Apr 2018 17:11:16 +0000
(17:11 +0000)
committer
Gerrit Code Review
<gerrit@wikimedia.org>
Thu, 12 Apr 2018 17:11:16 +0000
(17:11 +0000)
includes/user/User.php
patch
|
blob
|
history
diff --git
a/includes/user/User.php
b/includes/user/User.php
index
3e6b212
..
ea395f4
100644
(file)
--- a/
includes/user/User.php
+++ b/
includes/user/User.php
@@
-3084,7
+3084,7
@@
class User implements IDBAccessObject, UserIdentity {
* Get the user's current setting for a given option.
*
* @param string $oname The option to check
- * @param string $defaultOverride A default value returned if the option does not exist
+ * @param string
|array
$defaultOverride A default value returned if the option does not exist
* @param bool $ignoreHidden Whether to ignore the effects of $wgHiddenPrefs
* @return string|array|int|null User's current value for the option
* @see getBoolOption()