From 8091e9c6db18f5372470dfdcaaefaf31ed3312e4 Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Fri, 27 May 2016 10:21:27 -0700 Subject: [PATCH] Don't use $wgContentNamespaces directly Change-Id: If8ed1bf7e7c6429c405c956413af07a191ec9c40 --- includes/Title.php | 4 ++-- maintenance/rebuildFileCache.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/includes/Title.php b/includes/Title.php index 4555f16d9b..c3385e2ffd 100644 --- a/includes/Title.php +++ b/includes/Title.php @@ -4554,10 +4554,10 @@ class Title implements LinkTarget { * @return bool */ public function canUseNoindex() { - global $wgContentNamespaces, $wgExemptFromUserRobotsControl; + global $wgExemptFromUserRobotsControl; $bannedNamespaces = is_null( $wgExemptFromUserRobotsControl ) - ? $wgContentNamespaces + ? MWNamespace::getContentNamespaces() : $wgExemptFromUserRobotsControl; return !in_array( $this->mNamespace, $bannedNamespaces ); diff --git a/maintenance/rebuildFileCache.php b/maintenance/rebuildFileCache.php index b67bc36a5c..38556ede3e 100644 --- a/maintenance/rebuildFileCache.php +++ b/maintenance/rebuildFileCache.php @@ -48,7 +48,7 @@ class RebuildFileCache extends Maintenance { } public function execute() { - global $wgUseFileCache, $wgReadOnly, $wgContentNamespaces, $wgRequestTime; + global $wgUseFileCache, $wgReadOnly, $wgRequestTime; global $wgOut; if ( !$wgUseFileCache ) { $this->error( "Nothing to do -- \$wgUseFileCache is disabled.", true ); @@ -94,7 +94,7 @@ class RebuildFileCache extends Maintenance { while ( $blockEnd <= $end ) { // Get the pages $res = $dbr->select( 'page', [ 'page_namespace', 'page_title', 'page_id' ], - [ 'page_namespace' => $wgContentNamespaces, + [ 'page_namespace' => MWNamespace::getContentNamespaces(), "page_id BETWEEN $blockStart AND $blockEnd" ], [ 'ORDER BY' => 'page_id ASC', 'USE INDEX' => 'PRIMARY' ] ); -- 2.20.1