From 78d6b8163dd4f7e7efdf975ca7a95ba3840d6470 Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Sun, 25 Jul 2010 17:12:50 +0000 Subject: [PATCH] Remove some more unused globals Kill a couple of other unused variables --- CategoryPageSubclass.php | 2 +- CategoryTree.php | 2 +- CategoryTreeFunctions.php | 2 -- CategoryTreePage.php | 1 - 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/CategoryPageSubclass.php b/CategoryPageSubclass.php index 9f284a6d..7587af44 100644 --- a/CategoryPageSubclass.php +++ b/CategoryPageSubclass.php @@ -31,7 +31,7 @@ class CategoryTreeCategoryViewer extends CategoryViewer { * Add a subcategory to the internal lists */ function addSubcategoryObject( $cat, $sortkey, $pageLength ) { - global $wgContLang, $wgOut, $wgRequest; + global $wgRequest; $title = $cat->getTitle(); diff --git a/CategoryTree.php b/CategoryTree.php index b3575583..9f99734c 100644 --- a/CategoryTree.php +++ b/CategoryTree.php @@ -362,7 +362,7 @@ function efCategoryTreeArticleFromTitle( $title, &$article ) { * OutputPageMakeCategoryLinks hook, override category links */ function efCategoryTreeOutputPageMakeCategoryLinks( $out, &$categories, &$links ) { - global $wgContLang, $wgCategoryTreePageCategoryOptions; + global $wgCategoryTreePageCategoryOptions; $ct = new CategoryTree( $wgCategoryTreePageCategoryOptions ); diff --git a/CategoryTreeFunctions.php b/CategoryTreeFunctions.php index 5262915b..d6878192 100644 --- a/CategoryTreeFunctions.php +++ b/CategoryTreeFunctions.php @@ -792,8 +792,6 @@ class CategoryTree { * Creates a Title object from a user provided (and thus unsafe) string */ static function makeTitle( $title ) { - global $wgContLang, $wgCanonicalNamespaceNames; - $title = trim( $title ); if ( $title === null || $title === '' || $title === false ) { diff --git a/CategoryTreePage.php b/CategoryTreePage.php index 3b0edda4..4b3e344a 100644 --- a/CategoryTreePage.php +++ b/CategoryTreePage.php @@ -23,7 +23,6 @@ class CategoryTreePage extends SpecialPage { * Constructor */ function __construct() { - global $wgOut; SpecialPage::SpecialPage( 'CategoryTree', '', true ); wfLoadExtensionMessages( 'CategoryTree' ); }