From: Elliott Eggleston Date: Tue, 24 Jun 2014 21:19:32 +0000 (-0700) Subject: Fix SpecialPageFactory::getTitleForAlias X-Git-Tag: 1.31.0-rc.0~14060^2 X-Git-Url: https://git.cyclocoop.org/admin/?a=commitdiff_plain;h=2426b0efe8dcc99dc6e80b5a5a736b481befb3ed;p=lhc%2Fweb%2Fwiklou.git Fix SpecialPageFactory::getTitleForAlias It takes the result of resolveAlias and calls SpecialPage::getTitleFor. Unfortunately, resolveAlias returns an array of [name, subpage] while getTitleFor expects two string arguments. This commit makes SpecialPageFactory::getTitleForAlias call SpecialPage::getTitleFor with two string arguments instead of an array. Bug: 67045 Change-Id: Ia1a0abf753b03fc69d3d4de025c88312e3e45763 --- diff --git a/includes/specialpage/SpecialPageFactory.php b/includes/specialpage/SpecialPageFactory.php index f3ad69cd24..0138cf9c91 100644 --- a/includes/specialpage/SpecialPageFactory.php +++ b/includes/specialpage/SpecialPageFactory.php @@ -609,9 +609,9 @@ class SpecialPageFactory { * @return Title|null Title or null if there is no such alias */ static function getTitleForAlias( $alias ) { - $name = self::resolveAlias( $alias ); - if ( $name ) { - return SpecialPage::getTitleFor( $name ); + list( $name, $subpage ) = self::resolveAlias( $alias ); + if ( $name != null ) { + return SpecialPage::getTitleFor( $name, $subpage ); } else { return null; }