From: Brion Vibber Date: Wed, 6 Jun 2007 16:01:14 +0000 (+0000) Subject: * Skip additional setting of include_path in commandLine.inc (for non-Wikimedia mode) X-Git-Tag: 1.31.0-rc.0~52639 X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=72a4abe588a7511ed5a92a5e30f889c60d824c1a;p=lhc%2Fweb%2Fwiklou.git * Skip additional setting of include_path in commandLine.inc (for non-Wikimedia mode) * Fix some scripts that assumed include_path was set with various additional directories Stuff now seems to mostly work when not overriding include_path. Taking that out of LocalSettings is the next step... whee! --- diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 46ceea0f62..542b6b2ba7 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -27,7 +27,7 @@ if( !defined( 'MEDIAWIKI' ) ) { * Create a site configuration object * Not used for much in a default install */ -require_once( 'includes/SiteConfiguration.php' ); +require_once( "$IP/includes/SiteConfiguration.php" ); $wgConf = new SiteConfiguration; /** MediaWiki version number */ diff --git a/includes/ExternalStore.php b/includes/ExternalStore.php index fb66b65239..328809a2ea 100644 --- a/includes/ExternalStore.php +++ b/includes/ExternalStore.php @@ -41,10 +41,9 @@ class ExternalStore { return false; $class='ExternalStore'.ucfirst($proto); - /* Preloaded modules might exist, especially ones serving multiple protocols */ + /* Any custom modules should be added to $wgAutoLoadClasses for on-demand loading */ if (!class_exists($class)) { - if (!include_once($class.'.php')) - return false; + return false; } $store=new $class(); return $store; diff --git a/includes/SpecialRecentchanges.php b/includes/SpecialRecentchanges.php index b999344521..32f56fb15e 100644 --- a/includes/SpecialRecentchanges.php +++ b/includes/SpecialRecentchanges.php @@ -269,8 +269,6 @@ function wfSpecialRecentchanges( $par, $specialPage ) { } function rcFilterByCategories ( &$rows , $categories , $any ) { - require_once ( 'Categoryfinder.php' ) ; - # Filter categories $cats = array () ; foreach ( $categories AS $cat ) { diff --git a/languages/classes/LanguageZh.php b/languages/classes/LanguageZh.php index 9fa04985df..8054f6f3b1 100644 --- a/languages/classes/LanguageZh.php +++ b/languages/classes/LanguageZh.php @@ -7,7 +7,7 @@ require_once( dirname(__FILE__).'/LanguageZh_cn.php' ); class ZhConverter extends LanguageConverter { function loadDefaultTables() { - require( "includes/ZhConversion.php" ); + require( dirname(__FILE__)."/../../includes/ZhConversion.php" ); $this->mTables = array( 'zh-cn' => new ReplacementArray( $zh2CN ), 'zh-tw' => new ReplacementArray( $zh2TW ), diff --git a/maintenance/commandLine.inc b/maintenance/commandLine.inc index 3bf7f1b2e1..bff9171ac9 100644 --- a/maintenance/commandLine.inc +++ b/maintenance/commandLine.inc @@ -179,7 +179,7 @@ if ( file_exists( '/home/wikipedia/common/langlist' ) ) { #require_once( $IP.'/includes/ProfilerStub.php' ); require_once( $IP.'/includes/Defines.php' ); require_once( $settingsFile ); - ini_set( 'include_path', ".$sep$IP$sep$IP/includes$sep$IP/languages$sep$IP/maintenance" ); + /* ini_set( 'include_path', ".$sep$IP$sep$IP/includes$sep$IP/languages$sep$IP/maintenance" ); */ if ( is_readable( $IP.'/AdminSettings.php' ) ) { require_once( $IP.'/AdminSettings.php' ); @@ -214,8 +214,8 @@ ini_set( 'memory_limit', -1 ); $wgShowSQLErrors = true; -require_once( 'Setup.php' ); -require_once( 'install-utils.inc' ); +require_once( "$IP/includes/Setup.php" ); +require_once( "$IP/install-utils.inc" ); $wgTitle = null; # Much much faster startup than creating a title object set_time_limit(0); diff --git a/maintenance/dumpBackup.php b/maintenance/dumpBackup.php index 8e0941e27e..f6f1f70f56 100644 --- a/maintenance/dumpBackup.php +++ b/maintenance/dumpBackup.php @@ -26,8 +26,7 @@ $originalDir = getcwd(); $optionsWithArgs = array( 'pagelist', 'start', 'end' ); require_once( 'commandLine.inc' ); -require_once( 'SpecialExport.php' ); -require_once( 'maintenance/backup.inc' ); +require_once( 'backup.inc' ); $dumper = new BackupDumper( $argv ); diff --git a/maintenance/dumpReplayLog.php b/maintenance/dumpReplayLog.php index 07749f4149..a71c5b9276 100644 --- a/maintenance/dumpReplayLog.php +++ b/maintenance/dumpReplayLog.php @@ -6,7 +6,6 @@ error_reporting(E_ALL); /** */ require_once( "commandLine.inc" ); -require_once( 'includes/SpecialExport.php' ); /** */ function dumpReplayLog( $start ) { diff --git a/maintenance/dumpTextPass.php b/maintenance/dumpTextPass.php index 494c5ad4fc..bb90c54560 100644 --- a/maintenance/dumpTextPass.php +++ b/maintenance/dumpTextPass.php @@ -24,8 +24,7 @@ $originalDir = getcwd(); require_once( 'commandLine.inc' ); -require_once( 'SpecialExport.php' ); -require_once( 'maintenance/backup.inc' ); +require_once( 'backup.inc' ); /** * Stream wrapper around 7za filter program. diff --git a/maintenance/importDump.php b/maintenance/importDump.php index c7d36042a6..bd0326e85b 100644 --- a/maintenance/importDump.php +++ b/maintenance/importDump.php @@ -24,7 +24,6 @@ $optionsWithArgs = array( 'report' ); require_once( 'commandLine.inc' ); -require_once( 'SpecialImport.php' ); class BackupReader { var $reportingInterval = 100; diff --git a/maintenance/importUseModWiki.php b/maintenance/importUseModWiki.php index ae5dd23bf6..44a8ba83e3 100644 --- a/maintenance/importUseModWiki.php +++ b/maintenance/importUseModWiki.php @@ -45,7 +45,7 @@ $wgFieldSeparator = "\xb3"; # Some wikis may use different char $FS3 = $FS."3" ; # Unicode sanitization tools -require_once( '../includes/normal/UtfNormal.php' ); +require_once( dirname( dirname( __FILE__ ) ) . '/includes/normal/UtfNormal.php' ); $usercache = array(); diff --git a/maintenance/mcc.php b/maintenance/mcc.php index b0302ab239..d29201c364 100644 --- a/maintenance/mcc.php +++ b/maintenance/mcc.php @@ -8,7 +8,6 @@ /** */ require_once( 'commandLine.inc' ); -require_once( 'memcached-client.php' ); $mcc = new memcached( array('persistant' => true/*, 'debug' => true*/) ); $mcc->set_servers( $wgMemCachedServers ); diff --git a/maintenance/renderDump.php b/maintenance/renderDump.php index 5cb79c5316..f8b97e7c9f 100644 --- a/maintenance/renderDump.php +++ b/maintenance/renderDump.php @@ -2,7 +2,7 @@ /** * Take page text out of an XML dump file and render basic HTML out to files. * This is *NOT* suitable for publishing or offline use; it's intended for - * running comparitive tests of parsing behavior using real-world data. + * running comparative tests of parsing behavior using real-world data. * * Templates etc are pulled from the local wiki database, not from the dump. * @@ -30,7 +30,6 @@ $optionsWithArgs = array( 'report' ); require_once( 'commandLine.inc' ); -require_once( 'SpecialImport.php' ); class DumpRenderer { function __construct( $dir ) { diff --git a/skins/Chick.deps.php b/skins/Chick.deps.php index 54614c497a..8bb280a0fc 100644 --- a/skins/Chick.deps.php +++ b/skins/Chick.deps.php @@ -8,6 +8,6 @@ if ( ! defined( 'MEDIAWIKI' ) ) die( 1 ); -require_once('includes/SkinTemplate.php'); +require_once( dirname( dirname( __FILE__ ) ) . '/includes/SkinTemplate.php'); require_once( dirname(__FILE__) . '/MonoBook.php' ); ?> diff --git a/skins/MonoBook.deps.php b/skins/MonoBook.deps.php index b054c840c2..d3a47d78db 100644 --- a/skins/MonoBook.deps.php +++ b/skins/MonoBook.deps.php @@ -8,5 +8,5 @@ if ( ! defined( 'MEDIAWIKI' ) ) die( 1 ); -require_once('includes/SkinTemplate.php'); +require_once( dirname( dirname( __FILE__ ) ) . '/includes/SkinTemplate.php'); ?> diff --git a/skins/MonoBook.php b/skins/MonoBook.php index 50d7f00f3e..fc169e0c2a 100644 --- a/skins/MonoBook.php +++ b/skins/MonoBook.php @@ -12,9 +12,6 @@ if( !defined( 'MEDIAWIKI' ) ) die( -1 ); -/** */ -require_once('includes/SkinTemplate.php'); - /** * Inherit main code from SkinTemplate, set the CSS and template filter. * @todo document diff --git a/skins/MySkin.deps.php b/skins/MySkin.deps.php index 633ab5582c..0084934313 100644 --- a/skins/MySkin.deps.php +++ b/skins/MySkin.deps.php @@ -8,6 +8,6 @@ if ( ! defined( 'MEDIAWIKI' ) ) die( 1 ); -require_once('includes/SkinTemplate.php'); +require_once( dirname( dirname( __FILE__ ) ) . '/includes/SkinTemplate.php'); require_once( dirname(__FILE__) . '/MonoBook.php' ); ?> diff --git a/skins/Simple.deps.php b/skins/Simple.deps.php index b7f1f5eb0f..a2fa6ca758 100644 --- a/skins/Simple.deps.php +++ b/skins/Simple.deps.php @@ -8,6 +8,6 @@ if ( ! defined( 'MEDIAWIKI' ) ) die( 1 ); -require_once('includes/SkinTemplate.php'); +require_once( dirname( dirname( __FILE__ ) ) . '/includes/SkinTemplate.php'); require_once( dirname(__FILE__) . '/MonoBook.php' ); ?>