http://www.mediawiki.org/wiki/Special:Code/MediaWiki/84652
Revision: 84652
Author: reedy
Date: 2011-03-24 00:41:27 +0000 (Thu, 24 Mar 2011)
Log Message:
-----------
using "global $IP" in the global scope isn't going to do anything
Remove some unused globals elsewhere, comment out some others
Modified Paths:
--------------
trunk/extensions/FirefoggChunkedUpload/tests/UploadFromChunksTest.php
trunk/extensions/MetavidWiki/includes/specials/MV_SpecialExport.php
trunk/extensions/MetavidWiki/includes/specials/MV_SpecialMVAdmin.php
trunk/extensions/MwEmbedSupport/MwEmbedResourceManager.php
trunk/extensions/News/NewsRenderer.php
trunk/extensions/OAI/OAIRepo_body.php
trunk/extensions/ParserWiki/ParserEngine.php
trunk/extensions/RDFIO/stores/SMW_ARC2Store.php
trunk/extensions/SemanticNotifyMe/includes/jobs/SMW_NMRefreshJob.php
trunk/extensions/SemanticNotifyMe/specials/SMWNotifyMe/SMWNotifyMe.php
trunk/extensions/SiteMatrix/SiteMatrix_body.php
trunk/extensions/SocialProfile/SystemGifts/SystemGifts.php
trunk/extensions/skins/Daddio/Daddio.class.php
Modified: trunk/extensions/FirefoggChunkedUpload/tests/UploadFromChunksTest.php
===================================================================
--- trunk/extensions/FirefoggChunkedUpload/tests/UploadFromChunksTest.php
2011-03-24 00:37:10 UTC (rev 84651)
+++ trunk/extensions/FirefoggChunkedUpload/tests/UploadFromChunksTest.php
2011-03-24 00:41:27 UTC (rev 84652)
@@ -1,6 +1,5 @@
<?php
-global $IP;
require_once( "$IP/maintenance/tests/ApiSetup.php" );
require_once( "$IP/maintenance/deleteArchivedFiles.inc" );
require_once( "$IP/maintenance/deleteArchivedRevisions.inc" );
Modified: trunk/extensions/MetavidWiki/includes/specials/MV_SpecialExport.php
===================================================================
--- trunk/extensions/MetavidWiki/includes/specials/MV_SpecialExport.php
2011-03-24 00:37:10 UTC (rev 84651)
+++ trunk/extensions/MetavidWiki/includes/specials/MV_SpecialExport.php
2011-03-24 00:41:27 UTC (rev 84652)
@@ -20,7 +20,6 @@
*/
if ( !defined( 'MEDIAWIKI' ) ) die();
-global $IP, $smwgIP;
// all the special pages handled by this master Special Export (could reactor
into individual classes if we want to)
class MvVideoFeed extends SpecialPage {
function __construct() {
Modified: trunk/extensions/MetavidWiki/includes/specials/MV_SpecialMVAdmin.php
===================================================================
--- trunk/extensions/MetavidWiki/includes/specials/MV_SpecialMVAdmin.php
2011-03-24 00:37:10 UTC (rev 84651)
+++ trunk/extensions/MetavidWiki/includes/specials/MV_SpecialMVAdmin.php
2011-03-24 00:41:27 UTC (rev 84652)
@@ -35,14 +35,14 @@
}
public function execute( $par ) {
- global $IP, $mvgIP;
+ //global $IP, $mvgIP;
// require_once($IP . '/includes/SpecialPage.php' );
// require_once($IP . '/includes/Title.php' );
global $wgOut, $wgRequest;
- global $wgServer; // "http://www.yourserver.org";
+ //global $wgServer; // "http://www.yourserver.org";
// (should be equal to
'http://'.$_SERVER['SERVER_NAME'])
- global $wgScript; // "/subdirectory/of/wiki/index.php"
+ //global $wgScript; // "/subdirectory/of/wiki/index.php"
global $wgUser;
if ( ! $wgUser->isAllowed( 'delete' ) ) {
Modified: trunk/extensions/MwEmbedSupport/MwEmbedResourceManager.php
===================================================================
--- trunk/extensions/MwEmbedSupport/MwEmbedResourceManager.php 2011-03-24
00:37:10 UTC (rev 84651)
+++ trunk/extensions/MwEmbedSupport/MwEmbedResourceManager.php 2011-03-24
00:41:27 UTC (rev 84652)
@@ -18,7 +18,7 @@
* Adds modules to ResourceLoader
*/
public static function register( $mwEmbedResourcePath ) {
- global $IP, $wgExtensionMessagesFiles, $wgExtensionAssetsPath;
+ global $IP, $wgExtensionMessagesFiles;
$localResourcePath = $IP .'/' . $mwEmbedResourcePath;
// Get the module name from the end of the path:
$modulePathParts = explode( '/', $mwEmbedResourcePath );
Modified: trunk/extensions/News/NewsRenderer.php
===================================================================
--- trunk/extensions/News/NewsRenderer.php 2011-03-24 00:37:10 UTC (rev
84651)
+++ trunk/extensions/News/NewsRenderer.php 2011-03-24 00:41:27 UTC (rev
84652)
@@ -17,11 +17,6 @@
define('NEWS_HEAD_LENGTH', 1024 * 2);
define('NEWS_HEAD_SCAN', 256);
-#no need to include, rely on autoloader
-#global $IP;
-#require_once( "$IP/includes/RecentChange.php" );
-#require_once( "$IP/includes/ChangeList.php" );
-
class NewsRenderer {
var $parser;
var $skin;
Modified: trunk/extensions/OAI/OAIRepo_body.php
===================================================================
--- trunk/extensions/OAI/OAIRepo_body.php 2011-03-24 00:37:10 UTC (rev
84651)
+++ trunk/extensions/OAI/OAIRepo_body.php 2011-03-24 00:41:27 UTC (rev
84652)
@@ -3,7 +3,6 @@
die();
}
-global $IP;
require_once( "$IP/extensions/OAI/OAIFunctions.php" );
require_once( "$IP/includes/Export.php" );
Modified: trunk/extensions/ParserWiki/ParserEngine.php
===================================================================
--- trunk/extensions/ParserWiki/ParserEngine.php 2011-03-24 00:37:10 UTC
(rev 84651)
+++ trunk/extensions/ParserWiki/ParserEngine.php 2011-03-24 00:41:27 UTC
(rev 84652)
@@ -15,7 +15,6 @@
}
function parse($grammarName, &$text) {
- global $IP;
wfDebugLog("ParseEngine", "==========Start Parse
Engine==========\n");
$grammar = isset($this->mGrammars[$grammarName]) ?
$this->mGrammars[$grammarName] : NULL;
if ($grammar == NULL) {
Modified: trunk/extensions/RDFIO/stores/SMW_ARC2Store.php
===================================================================
--- trunk/extensions/RDFIO/stores/SMW_ARC2Store.php 2011-03-24 00:37:10 UTC
(rev 84651)
+++ trunk/extensions/RDFIO/stores/SMW_ARC2Store.php 2011-03-24 00:41:27 UTC
(rev 84652)
@@ -4,8 +4,6 @@
die( 'Not a valid entry point.' );
}
-global $IP;
-
require_once(
"$IP/extensions/SemanticMediaWiki/includes/storage/SMW_SQLStore2.php" );
/**
Modified: trunk/extensions/SemanticNotifyMe/includes/jobs/SMW_NMRefreshJob.php
===================================================================
--- trunk/extensions/SemanticNotifyMe/includes/jobs/SMW_NMRefreshJob.php
2011-03-24 00:37:10 UTC (rev 84651)
+++ trunk/extensions/SemanticNotifyMe/includes/jobs/SMW_NMRefreshJob.php
2011-03-24 00:41:27 UTC (rev 84652)
@@ -6,7 +6,7 @@
if ( !defined( 'MEDIAWIKI' ) ) {
die( "This file is part of the Semantic NotifyMe Extension. It is not a
valid entry point.\n" );
}
-global $IP;
+
require_once( "$IP/includes/JobQueue.php" );
class SMWNMRefreshJob extends Job {
Modified: trunk/extensions/SemanticNotifyMe/specials/SMWNotifyMe/SMWNotifyMe.php
===================================================================
--- trunk/extensions/SemanticNotifyMe/specials/SMWNotifyMe/SMWNotifyMe.php
2011-03-24 00:37:10 UTC (rev 84651)
+++ trunk/extensions/SemanticNotifyMe/specials/SMWNotifyMe/SMWNotifyMe.php
2011-03-24 00:41:27 UTC (rev 84652)
@@ -5,9 +5,6 @@
if ( !defined( 'MEDIAWIKI' ) ) die();
-
-
-global $IP;
require_once( $IP . "/includes/SpecialPage.php" );
/*
Modified: trunk/extensions/SiteMatrix/SiteMatrix_body.php
===================================================================
--- trunk/extensions/SiteMatrix/SiteMatrix_body.php 2011-03-24 00:37:10 UTC
(rev 84651)
+++ trunk/extensions/SiteMatrix/SiteMatrix_body.php 2011-03-24 00:41:27 UTC
(rev 84652)
@@ -6,7 +6,6 @@
}
-global $IP;
require_once( $IP.'/languages/Names.php' );
class SiteMatrix {
Modified: trunk/extensions/SocialProfile/SystemGifts/SystemGifts.php
===================================================================
--- trunk/extensions/SocialProfile/SystemGifts/SystemGifts.php 2011-03-24
00:37:10 UTC (rev 84651)
+++ trunk/extensions/SocialProfile/SystemGifts/SystemGifts.php 2011-03-24
00:41:27 UTC (rev 84652)
@@ -1,8 +1,5 @@
<?php
-global $IP, $wgScriptPath, $wgAutoloadClasses, $wgAvailableRights,
$wgGroupPermissions,
- $wgSpecialPages, $wgExtenstionMessagesFiles;
-
$wgAvailableRights[] = 'awardsmanage';
$wgGroupPermissions['staff']['awardsmanage'] = true;
$wgGroupPermissions['sysop']['awardsmanage'] = true;
Modified: trunk/extensions/skins/Daddio/Daddio.class.php
===================================================================
--- trunk/extensions/skins/Daddio/Daddio.class.php 2011-03-24 00:37:10 UTC
(rev 84651)
+++ trunk/extensions/skins/Daddio/Daddio.class.php 2011-03-24 00:41:27 UTC
(rev 84652)
@@ -8,7 +8,6 @@
if( !defined( 'MEDIAWIKI' ) )
die( -1 );
-global $IP;
// @todo Fixme: autoload ModernTemplate
require_once( "$IP/skins/Modern.php" );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
