From 061f4f07a67c24e08200ea6f22d6c1ece6f2f54f Mon Sep 17 00:00:00 2001 From: Platonides Date: Sat, 27 Aug 2011 18:28:04 +0000 Subject: [PATCH] Unused variables. $wgContLang in CategoryPage was probably removed with the better directionality improvements. $wgServer, $wgRequest in getFullUrl() unused since r94375 Other variables added in r95396 iwtransclusion merge. --- includes/CategoryPage.php | 2 +- includes/Title.php | 8 +++----- includes/cache/HTMLCacheUpdate.php | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/includes/CategoryPage.php b/includes/CategoryPage.php index 42b06a307e..bb08cf518e 100644 --- a/includes/CategoryPage.php +++ b/includes/CategoryPage.php @@ -143,7 +143,7 @@ class CategoryViewer { * @return string HTML output */ public function getHTML() { - global $wgOut, $wgCategoryMagicGallery, $wgContLang; + global $wgOut, $wgCategoryMagicGallery; wfProfileIn( __METHOD__ ); $this->showGallery = $wgCategoryMagicGallery && !$wgOut->mNoGallery; diff --git a/includes/Title.php b/includes/Title.php index 61905dc42e..725170c2bb 100644 --- a/includes/Title.php +++ b/includes/Title.php @@ -849,8 +849,6 @@ class Title { * @return String the URL */ public function getFullURL( $query = '', $variant = false ) { - global $wgServer, $wgRequest; - # Hand off all the decisions on urls to getLocalURL $url = $this->getLocalURL( $query, $variant ); @@ -3162,7 +3160,7 @@ class Title { * @return Mixed true on success, getUserPermissionsErrors()-like array on failure */ public function moveTo( &$nt, $auth = true, $reason = '', $createRedirect = true ) { - global $wgContLang, $wgEnableInterwikiTemplatesTracking, $wgGlobalDatabase; + global $wgEnableInterwikiTemplatesTracking, $wgGlobalDatabase; $err = $this->isValidMoveOperation( $nt, $auth, $reason ); if ( is_array( $err ) ) { @@ -3323,7 +3321,7 @@ class Title { * if the user doesn't have the suppressredirect right */ private function moveOverExistingRedirect( &$nt, $reason = '', $createRedirect = true ) { - global $wgUseSquid, $wgUser, $wgContLang, $wgEnableInterwikiTemplatesTracking, $wgGlobalDatabase; + global $wgUser, $wgContLang, $wgEnableInterwikiTemplatesTracking, $wgGlobalDatabase; $moveOverRedirect = $nt->exists(); @@ -4369,4 +4367,4 @@ class Title { wfRunHooks( 'PageContentLanguage', array( $this, &$pageLang, $wgLang ) ); return wfGetLangObj( $pageLang ); } -} \ No newline at end of file +} diff --git a/includes/cache/HTMLCacheUpdate.php b/includes/cache/HTMLCacheUpdate.php index 433e91cb5a..4fd6c9a382 100644 --- a/includes/cache/HTMLCacheUpdate.php +++ b/includes/cache/HTMLCacheUpdate.php @@ -213,7 +213,7 @@ class HTMLCacheUpdate * Invalidate an array of distant pages, given the wiki ID and page ID of those pages */ protected function invalidateDistantTitles( $distantPageArray ) { - global $wgUseFileCache, $wgUseSquid, $wgLocalInterwiki; + global $wgUseSquid; $pagesByWiki = array(); $titleArray = array(); -- 2.20.1