From: jenkins-bot Date: Thu, 19 Sep 2019 20:26:45 +0000 (+0000) Subject: Merge "title: Improve docs of get*URL()" X-Git-Tag: 1.34.0-rc.0~146 X-Git-Url: http://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=38d5d59a6617dfb6a4aa41ae6da8645a5e8a3c53;hp=02210976ab8a2d865c53df85dfb21dae2f0d709b Merge "title: Improve docs of get*URL()" --- diff --git a/includes/Title.php b/includes/Title.php index 0f5c3841ff..9843e81962 100644 --- a/includes/Title.php +++ b/includes/Title.php @@ -2062,7 +2062,7 @@ class Title implements LinkTarget, IDBAccessObject { * * @see self::getLocalURL for the arguments. * @see wfExpandUrl - * @param string|string[] $query + * @param string|array $query * @param string|string[]|bool $query2 * @param string|int|null $proto Protocol type to use in URL * @return string The URL @@ -2123,7 +2123,7 @@ class Title implements LinkTarget, IDBAccessObject { * valid to link, locally, to the current Title. * @see self::newFromText to produce a Title object. * - * @param string|string[] $query An optional query string, + * @param string|array $query An optional query string, * not used for interwiki links. Can be specified as an associative array as well, * e.g., [ 'action' => 'edit' ] (keys and values will be URL-escaped). * Some query patterns will trigger various shorturl path replacements. @@ -2258,7 +2258,7 @@ class Title implements LinkTarget, IDBAccessObject { * protocol-relative, the URL will be expanded to http:// * * @see self::getLocalURL for the arguments. - * @param string|string[] $query + * @param string|array $query * @param string|bool $query2 Deprecated * @return string The URL */ @@ -2281,7 +2281,7 @@ class Title implements LinkTarget, IDBAccessObject { * NOTE: Unlike getInternalURL(), the canonical URL includes the fragment * * @see self::getLocalURL for the arguments. - * @param string|string[] $query + * @param string|array $query * @param string|bool $query2 Deprecated * @return string The URL * @since 1.18