X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FTitle.php;h=60adb570fe15cdf2397115c05e622d5703e4a619;hb=9ddd146c262806e993ea66994f367a0a795e762d;hp=9843e81962ac9296e1faf915690b0f1bb4d856b0;hpb=60882bb6b07aa0a9cbf0f8a2224cc94e2575dc11;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/Title.php b/includes/Title.php index 9843e81962..60adb570fe 100644 --- a/includes/Title.php +++ b/includes/Title.php @@ -1266,13 +1266,11 @@ class Title implements LinkTarget, IDBAccessObject { /** * Returns true if the title is inside one of the specified namespaces. * - * @param int|int[] $namespaces,... The namespaces to check for + * @param int|int[] ...$namespaces The namespaces to check for * @return bool * @since 1.19 - * @suppress PhanCommentParamOnEmptyParamList Cannot make variadic due to HHVM bug, T191668#5263929 */ - public function inNamespaces( /* ... */ ) { - $namespaces = func_get_args(); + public function inNamespaces( ...$namespaces ) { if ( count( $namespaces ) > 0 && is_array( $namespaces[0] ) ) { $namespaces = $namespaces[0]; } @@ -2137,7 +2135,7 @@ class Title implements LinkTarget, IDBAccessObject { * @return string String of the URL. */ public function getLocalURL( $query = '', $query2 = false ) { - global $wgArticlePath, $wgScript, $wgServer, $wgRequest; + global $wgArticlePath, $wgScript, $wgServer, $wgRequest, $wgMainPageIsDomainRoot; $query = self::fixUrlQueryArgs( $query, $query2 ); @@ -2214,6 +2212,11 @@ class Title implements LinkTarget, IDBAccessObject { $url = $wgServer . $url; } } + + if ( $wgMainPageIsDomainRoot && $this->isMainPage() && $query === '' ) { + return '/'; + } + // Avoid PHP 7.1 warning from passing $this by reference $titleRef = $this; Hooks::run( 'GetLocalURL', [ &$titleRef, &$url, $query ] );