From c1f9b1f7b1b77776192048005dcc66dcf3df2bfb Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sat, 27 Dec 2014 15:41:37 +0100 Subject: Update to MediaWiki 1.24.1 --- includes/specials/SpecialRandompage.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'includes/specials/SpecialRandompage.php') diff --git a/includes/specials/SpecialRandompage.php b/includes/specials/SpecialRandompage.php index c94d2b35..6d8f59b5 100644 --- a/includes/specials/SpecialRandompage.php +++ b/includes/specials/SpecialRandompage.php @@ -56,7 +56,9 @@ class RandomPage extends SpecialPage { public function execute( $par ) { global $wgContLang; - if ( $par ) { + if ( is_string( $par ) ) { + // Testing for stringiness since we want to catch + // the empty string to mean main namespace only. $this->setNamespace( $wgContLang->getNsIndex( $par ) ); } @@ -80,7 +82,7 @@ class RandomPage extends SpecialPage { /** * Get a comma-delimited list of namespaces we don't have * any pages in - * @return String + * @return string */ private function getNsList() { global $wgContLang; @@ -98,7 +100,7 @@ class RandomPage extends SpecialPage { /** * Choose a random title. - * @return Title object (or null if nothing to choose from) + * @return Title|null Title object (or null if nothing to choose from) */ public function getRandomTitle() { $randstr = wfRandom(); @@ -144,7 +146,6 @@ class RandomPage extends SpecialPage { ), $this->extra ), 'options' => array( 'ORDER BY' => 'page_random', - 'USE INDEX' => 'page_random', 'LIMIT' => 1, ), 'join_conds' => array() -- cgit v1.2.3-54-g00ecf