Reverting r16861; incompatible change to message texts, breaks a lot of toggle displa...

[lhc/web/wiklou.git] / includes / SpecialRandompage.php

diff --git a/includes/SpecialRandompage.php b/includes/SpecialRandompage.php
index f2cf40a..9d38abc 100644 (file)
--- a/includes/SpecialRandompage.php
+++ b/includes/SpecialRandompage.php
@@ -7,19 +7,17 @@
 /**
  * Constructor
  *
- * @param string $par the namespace to get a random page from (default NS_MAIN), 
+ * @param $par The namespace to get a random page from (default NS_MAIN),
  *               used as e.g. Special:Randompage/Category
  */
 function wfSpecialRandompage( $par = NS_MAIN ) {
-       global $wgOut, $wgTitle, $wgArticle, $wgExtraRandompageSQL, $wgContLang;
+       global $wgOut, $wgExtraRandompageSQL, $wgContLang, $wgLang;
        $fname = 'wfSpecialRandompage';
 
-       # Determine the namespace to get a random page from.
-       $namespace = $wgContLang->getNsIndex($par);
-       if ($namespace === false || $namespace < NS_MAIN) {
-               $namespace = NS_MAIN;
-       }
-       
+       # Determine namespace
+       $t = Title::newFromText ( $par . ":Dummy" ) ;
+       $namespace = $t->getNamespace () ;
+
        # NOTE! We use a literal constant in the SQL instead of the RAND()
        # function because RAND() will return a different value for every row
        # in the table. That's both very slow and returns results heavily
@@ -28,34 +26,30 @@ function wfSpecialRandompage( $par = NS_MAIN ) {
        #
        # Using a literal constant means the whole thing gets optimized on
        # the index, and the comparison is both fast and fair.
-       
+
        # interpolation and sprintf() can muck up with locale-specific decimal separator
        $randstr = wfRandom();
-       
+
        $db =& wfGetDB( DB_SLAVE );
        $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 );
-       
+               ORDER BY page_random";
+       $sql = $db->limitResult($sql, 1, 0);
+       $res = $db->query( $sql, $fname );
+
        $title = null;
        if( $s = $db->fetchObject( $res ) ) {
                $title =& Title::makeTitle( $namespace, $s->page_title );
-       }       
+       }
        if( is_null( $title ) ) {
                # That's not supposed to happen :)
-               $title =& Title::newFromText( wfMsg( 'mainpage' ) );
+               $title = Title::newFromText( wfMsg( 'mainpage' ) );
        }
        $wgOut->reportTime(); # for logfile
        $wgOut->redirect( $title->getFullUrl() );