From fd57e622388d86cf8de0d83fdf58e1b4191f7e75 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Fri, 29 Apr 2005 19:15:50 +0000 Subject: [PATCH] * Code cleanup --- includes/SpecialRandompage.php | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/includes/SpecialRandompage.php b/includes/SpecialRandompage.php index f2cf40aae3..0cc945e527 100644 --- a/includes/SpecialRandompage.php +++ b/includes/SpecialRandompage.php @@ -16,7 +16,7 @@ function wfSpecialRandompage( $par = NS_MAIN ) { # Determine the namespace to get a random page from. $namespace = $wgContLang->getNsIndex($par); - if ($namespace === false || $namespace < NS_MAIN) { + if (!$namespace || $namespace < NS_MAIN) { $namespace = NS_MAIN; } @@ -36,18 +36,14 @@ function wfSpecialRandompage( $par = NS_MAIN ) { $use_index = $db->useIndexClause( 'page_random' ); $page = $db->tableName( 'page' ); - if ( $wgExtraRandompageSQL ) { - $extra = "AND ($wgExtraRandompageSQL)"; - } else { - $extra = ''; - } - $sqlget = "SELECT page_id,page_title + $extra = $wgExtraRandompageSQL ? "AND ($wgExtraRandompageSQL)" : ''; + $sql = "SELECT page_id,page_title FROM $page $use_index - WHERE page_namespace=".$namespace." AND page_is_redirect=0 $extra + WHERE page_namespace=$namespace AND page_is_redirect=0 $extra AND page_random>$randstr ORDER BY page_random LIMIT 1"; - $res = $db->query( $sqlget, $fname ); + $res = $db->query( $sql, $fname ); $title = null; if( $s = $db->fetchObject( $res ) ) { -- 2.20.1