Followup r82641, set default for 2nd param

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

diff --git a/includes/specials/SpecialRandompage.php b/includes/specials/SpecialRandompage.php
index f01c180..4e3febe 100644 (file)
--- a/includes/specials/SpecialRandompage.php
+++ b/includes/specials/SpecialRandompage.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * Implements Special:Randompage
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,16 +14,18 @@
  *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup SpecialPage
+ * @author Rob Church <robchur@gmail.com>, Ilmari Karonen
  */
 
 /**
  * Special page to direct the user to a random page
  *
  * @ingroup SpecialPage
- * @author Rob Church <robchur@gmail.com>, Ilmari Karonen
- * @license GNU General Public Licence 2.0 or later
  */
 class RandomPage extends SpecialPage {
        private $namespaces;  // namespaces to select pages from
@@ -40,7 +43,9 @@ class RandomPage extends SpecialPage {
        }
 
        public function setNamespace ( $ns ) {
-               if( !$ns || $ns < NS_MAIN ) $ns = NS_MAIN;
+               if( !$ns || $ns < NS_MAIN ) {
+                       $ns = NS_MAIN;
+               }
                $this->namespaces = array( $ns );
        }
 
@@ -80,15 +85,15 @@ class RandomPage extends SpecialPage {
                global $wgContLang;
                $nsNames = array();
                foreach( $this->namespaces as $n ) {
-                       if( $n === NS_MAIN )
+                       if( $n === NS_MAIN ) {
                                $nsNames[] = wfMsgForContent( 'blanknamespace' );
-                       else
+                       } else {
                                $nsNames[] = $wgContLang->getNsText( $n );
+                       }
                }
                return $wgContLang->commaList( $nsNames );
        }
 
-
        /**
         * Choose a random title.
         * @return Title object (or null if nothing to choose from)
@@ -96,7 +101,8 @@ class RandomPage extends SpecialPage {
        public function getRandomTitle() {
                $randstr = wfRandom();
                $title = null;
-               if ( !wfRunHooks( 'SpecialRandomGetRandomTitle', array( &$randstr, &$this->isRedir, &$this->namespaces, &$this->extra, &$title ) ) ) {
+               if ( !wfRunHooks( 'SpecialRandomGetRandomTitle', array( &$randstr, &$this->isRedir, &$this->namespaces,
+                       &$this->extra, &$title ) ) ) {
                        return $title;
                }
                $row = $this->selectRandomPageFromDB( $randstr );
@@ -108,45 +114,58 @@ class RandomPage extends SpecialPage {
                 * any more bias than what the page_random scheme
                 * causes anyway.  Trust me, I'm a mathematician. :)
                 */
-               if( !$row )
+               if( !$row ) {
                        $row = $this->selectRandomPageFromDB( "0" );
+               }
 
-               if( $row )
+               if( $row ) {
                        return Title::makeTitleSafe( $row->page_namespace, $row->page_title );
-               else
+               } else {
                        return null;
+               }
        }
 
-       private function selectRandomPageFromDB( $randstr ) {
+       protected function getQueryInfo( $randstr ) {
                global $wgExtraRandompageSQL;
-               $dbr = wfGetDB( DB_SLAVE );
-
-               $use_index = $dbr->useIndexClause( 'page_random' );
-               $page = $dbr->tableName( 'page' );
-
-               $ns = implode( ",", $this->namespaces );
                $redirect = $this->isRedirect() ? 1 : 0;
-               
+
                if ( $wgExtraRandompageSQL ) {
                        $this->extra[] = $wgExtraRandompageSQL;
                }
                if ( $this->addExtraSQL() ) {
                        $this->extra[] = $this->addExtraSQL();
                }
-               $extra = '';
-               if ( $this->extra ) {
-                       $extra = 'AND (' . implode( ') AND (', $this->extra ) . ')';
-               }
-               $sql = "SELECT page_title, page_namespace
-                       FROM $page $use_index
-                       WHERE page_namespace IN ( $ns )
-                       AND page_is_redirect = $redirect
-                       AND page_random >= $randstr
-                       $extra
-                       ORDER BY page_random";
-
-               $sql = $dbr->limitResult( $sql, 1, 0 );
-               $res = $dbr->query( $sql, __METHOD__ );
+
+               return array(
+                       'tables' => array( 'page' ),
+                       'fields' => array( 'page_title', 'page_namespace' ),
+                       'conds' => array_merge( array(
+                               'page_namespace' => $this->namespaces,
+                               'page_is_redirect' => $redirect,
+                               'page_random >= ' . $randstr
+                       ), $this->extra ),
+                       'options' => array(
+                               'ORDER BY' => 'page_random',
+                               'USE INDEX' => 'page_random',
+                               'LIMIT' => 1,
+                       ),
+                       'join_conds' => array()
+               );
+       }
+
+       private function selectRandomPageFromDB( $randstr, $fname = __METHOD__ ) {
+               $dbr = wfGetDB( DB_SLAVE );
+
+               $query = $this->getQueryInfo( $randstr );
+               $res = $dbr->select(
+                       $query['tables'],
+                       $query['fields'],
+                       $query['conds'],
+                       $fname,
+                       $query['options'],
+                       $query['join_conds']
+               );
+
                return $dbr->fetchObject( $res );
        }