From: Tim Starling <tstarling@users.mediawiki.org>
Date: Sun, 24 Oct 2004 01:56:23 +0000 (+0000)
Subject: Changed inclusion style, require_once('includes/SpecialPage.php') was allowing duplic... 
X-Git-Tag: 1.5.0alpha1~1477
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=cde9474e33befdcb1f7f888f61312221a9dbd948;p=lhc%2Fweb%2Fwiklou.git

Changed inclusion style, require_once('includes/SpecialPage.php') was allowing duplicate inclusion in command-line utilities
---

diff --git a/extensions/ShowProcesslist.php b/extensions/ShowProcesslist.php
index 1ee9d4016a..23f159784e 100644
--- a/extensions/ShowProcesslist.php
+++ b/extensions/ShowProcesslist.php
@@ -1,10 +1,12 @@
 <?php
+# Not a valid entry point, skip unless MEDIAWIKI is defined
+if (defined('MEDIAWIKI')) {
 
 $wgExtensionFunctions[] = "wfShowProcesslist";
 
 function wfShowProcesslist() {
-
-require_once( 'includes/SpecialPage.php' );
+global $IP;
+require_once( "$IP/includes/SpecialPage.php" );
 
 class ShowProcesslistPage extends UnlistedSpecialPage
 {
@@ -41,4 +43,5 @@ class ShowProcesslistPage extends UnlistedSpecialPage
 SpecialPage::addPage( new ShowProcesslistPage );
 
 } # End of extension function
+} # End of invocation guard
 ?>
diff --git a/extensions/SiteMatrix.php b/extensions/SiteMatrix.php
index 94beb5cd3e..aa25a832d2 100644
--- a/extensions/SiteMatrix.php
+++ b/extensions/SiteMatrix.php
@@ -2,10 +2,15 @@
 
 # Make an HTML table showing all the wikis on the site
 
-
+# Not a valid entry point, skip unless MEDIAWIKI is defined
+if (defined('MEDIAWIKI')) {
+	
 $wgExtensionFunctions[] = "wfSiteMatrix";
 
 function wfSiteMatrix() {
+global $IP;
+require_once( "$IP/includes/SpecialPage.php" );
+
 class SiteMatrixPage extends SpecialPage
 {
 	function SiteMatrixPage() {
@@ -93,4 +98,5 @@ global $wgMessageCache;
 $wgMessageCache->addMessage( "sitematrix", "List of Wikimedia wikis" );
 
 } # End of extension function
+} # End of invocation protection
 ?>
diff --git a/extensions/UnicodeConverter.php b/extensions/UnicodeConverter.php
index 1012889cb9..7ab7fe3cb4 100644
--- a/extensions/UnicodeConverter.php
+++ b/extensions/UnicodeConverter.php
@@ -4,11 +4,13 @@
 # Given a string in UTF-8, it converts it to HTML entities suitable for 
 # an ISO 8859-1 web page.
 
+# Not a valid entry point, skip unless MEDIAWIKI is defined
+if (defined('MEDIAWIKI')) {
 $wgExtensionFunctions[] = "wfUnicodeConverter";
 
 function wfUnicodeConverter() {
-
-require_once( "includes/SpecialPage.php" );
+global $IP;
+require_once( "$IP/includes/SpecialPage.php" );
 
 class UnicodeConverter extends SpecialPage
 {
@@ -47,4 +49,5 @@ SpecialPage::addPage( new UnicodeConverter );
 $wgMessageCache->addMessage( "unicodeconverter", "Unicode Converter" );
 
 } # End of extension function
+} # End of invocation guard
 ?>