From: Kunal Mehta <legoktm@member.fsf.org>
Date: Thu, 12 Apr 2018 16:42:14 +0000 (-0700)
Subject: Update User::getOption() PHPDoc
X-Git-Tag: 1.31.0-rc.0~102^2
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=278d80b8a1912918ec1caf2f6d177b03d847e474

Update User::getOption() PHPDoc

The default value could be an array, as is used in Echo.

Change-Id: I90f1d4821ec544cfba9ad48bd1a44f8bb8275317
---

diff --git a/includes/user/User.php b/includes/user/User.php
index 3e6b212097..ea395f4acd 100644
--- 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()