X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fspecials%2FSpecialRandompage.php;h=e3b567d7fe69c28a9235ee93745794d876661e88;hb=8af9c78c85b532743421507bc02b1c0d21757116;hp=9f7ef6690e03846a01a7fba4e31da31b7367d9fc;hpb=f1a890c34cebd8744bf3a6277734275fb975575a;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/specials/SpecialRandompage.php b/includes/specials/SpecialRandompage.php index 9f7ef6690e..e3b567d7fe 100644 --- a/includes/specials/SpecialRandompage.php +++ b/includes/specials/SpecialRandompage.php @@ -30,7 +30,7 @@ class RandomPage extends SpecialPage { private $namespaces; // namespaces to select pages from protected $isRedir = false; // should the result be a redirect? - protected $extra = array(); // Extra SQL statements + protected $extra = []; // Extra SQL statements public function __construct( $name = 'Randompage' ) { $this->namespaces = MWNamespace::getContentNamespaces(); @@ -45,7 +45,7 @@ class RandomPage extends SpecialPage { if ( !$ns || $ns < NS_MAIN ) { $ns = NS_MAIN; } - $this->namespaces = array( $ns ); + $this->namespaces = [ $ns ]; } // select redirects instead of normal pages? @@ -73,7 +73,7 @@ class RandomPage extends SpecialPage { return; } - $redirectParam = $this->isRedirect() ? array( 'redirect' => 'no' ) : array(); + $redirectParam = $this->isRedirect() ? [ 'redirect' => 'no' ] : []; $query = array_merge( $this->getRequest()->getValues(), $redirectParam ); unset( $query['title'] ); $this->getOutput()->redirect( $title->getFullURL( $query ) ); @@ -86,7 +86,7 @@ class RandomPage extends SpecialPage { */ private function getNsList() { global $wgContLang; - $nsNames = array(); + $nsNames = []; foreach ( $this->namespaces as $n ) { if ( $n === NS_MAIN ) { $nsNames[] = $this->msg( 'blanknamespace' )->plain(); @@ -108,7 +108,7 @@ class RandomPage extends SpecialPage { if ( !Hooks::run( 'SpecialRandomGetRandomTitle', - array( &$randstr, &$this->isRedir, &$this->namespaces, &$this->extra, &$title ) + [ &$randstr, &$this->isRedir, &$this->namespaces, &$this->extra, &$title ] ) ) { return $title; } @@ -135,31 +135,31 @@ class RandomPage extends SpecialPage { protected function getQueryInfo( $randstr ) { $redirect = $this->isRedirect() ? 1 : 0; - $tables = array( 'page' ); - $conds = array_merge( array( + $tables = [ 'page' ]; + $conds = array_merge( [ 'page_namespace' => $this->namespaces, 'page_is_redirect' => $redirect, 'page_random >= ' . $randstr - ), $this->extra ); - $joinConds = array(); + ], $this->extra ); + $joinConds = []; // Allow extensions to modify the query - Hooks::run( 'RandomPageQuery', array( &$tables, &$conds, &$joinConds ) ); + Hooks::run( 'RandomPageQuery', [ &$tables, &$conds, &$joinConds ] ); - return array( + return [ 'tables' => $tables, - 'fields' => array( 'page_title', 'page_namespace' ), + 'fields' => [ 'page_title', 'page_namespace' ], 'conds' => $conds, - 'options' => array( + 'options' => [ 'ORDER BY' => 'page_random', 'LIMIT' => 1, - ), + ], 'join_conds' => $joinConds - ); + ]; } private function selectRandomPageFromDB( $randstr, $fname = __METHOD__ ) { - $dbr = wfGetDB( DB_SLAVE ); + $dbr = wfGetDB( DB_REPLICA ); $query = $this->getQueryInfo( $randstr ); $res = $dbr->select(