| Index: trunk/phase3/maintenance/mcc.php |
| — | — | @@ -8,7 +8,6 @@ |
| 9 | 9 | |
| 10 | 10 | /** */ |
| 11 | 11 | require_once( 'commandLine.inc' ); |
| 12 | | -require_once( 'memcached-client.php' ); |
| 13 | 12 | |
| 14 | 13 | $mcc = new memcached( array('persistant' => true/*, 'debug' => true*/) ); |
| 15 | 14 | $mcc->set_servers( $wgMemCachedServers ); |
| Index: trunk/phase3/maintenance/dumpReplayLog.php |
| — | — | @@ -6,7 +6,6 @@ |
| 7 | 7 | |
| 8 | 8 | /** */ |
| 9 | 9 | require_once( "commandLine.inc" ); |
| 10 | | -require_once( 'includes/SpecialExport.php' ); |
| 11 | 10 | |
| 12 | 11 | /** */ |
| 13 | 12 | function dumpReplayLog( $start ) { |
| Index: trunk/phase3/maintenance/importDump.php |
| — | — | @@ -24,7 +24,6 @@ |
| 25 | 25 | $optionsWithArgs = array( 'report' ); |
| 26 | 26 | |
| 27 | 27 | require_once( 'commandLine.inc' ); |
| 28 | | -require_once( 'SpecialImport.php' ); |
| 29 | 28 | |
| 30 | 29 | class BackupReader { |
| 31 | 30 | var $reportingInterval = 100; |
| Index: trunk/phase3/maintenance/importUseModWiki.php |
| — | — | @@ -45,7 +45,7 @@ |
| 46 | 46 | $FS3 = $FS."3" ; |
| 47 | 47 | |
| 48 | 48 | # Unicode sanitization tools |
| 49 | | -require_once( '../includes/normal/UtfNormal.php' ); |
| | 49 | +require_once( dirname( dirname( __FILE__ ) ) . '/includes/normal/UtfNormal.php' ); |
| 50 | 50 | |
| 51 | 51 | $usercache = array(); |
| 52 | 52 | |
| Index: trunk/phase3/maintenance/commandLine.inc |
| — | — | @@ -179,7 +179,7 @@ |
| 180 | 180 | #require_once( $IP.'/includes/ProfilerStub.php' ); |
| 181 | 181 | require_once( $IP.'/includes/Defines.php' ); |
| 182 | 182 | require_once( $settingsFile ); |
| 183 | | - ini_set( 'include_path', ".$sep$IP$sep$IP/includes$sep$IP/languages$sep$IP/maintenance" ); |
| | 183 | + /* ini_set( 'include_path', ".$sep$IP$sep$IP/includes$sep$IP/languages$sep$IP/maintenance" ); */ |
| 184 | 184 | |
| 185 | 185 | if ( is_readable( $IP.'/AdminSettings.php' ) ) { |
| 186 | 186 | require_once( $IP.'/AdminSettings.php' ); |
| — | — | @@ -214,8 +214,8 @@ |
| 215 | 215 | |
| 216 | 216 | $wgShowSQLErrors = true; |
| 217 | 217 | |
| 218 | | -require_once( 'Setup.php' ); |
| 219 | | -require_once( 'install-utils.inc' ); |
| | 218 | +require_once( "$IP/includes/Setup.php" ); |
| | 219 | +require_once( "$IP/install-utils.inc" ); |
| 220 | 220 | $wgTitle = null; # Much much faster startup than creating a title object |
| 221 | 221 | set_time_limit(0); |
| 222 | 222 | |
| Index: trunk/phase3/maintenance/renderDump.php |
| — | — | @@ -2,7 +2,7 @@ |
| 3 | 3 | /** |
| 4 | 4 | * Take page text out of an XML dump file and render basic HTML out to files. |
| 5 | 5 | * This is *NOT* suitable for publishing or offline use; it's intended for |
| 6 | | - * running comparitive tests of parsing behavior using real-world data. |
| | 6 | + * running comparative tests of parsing behavior using real-world data. |
| 7 | 7 | * |
| 8 | 8 | * Templates etc are pulled from the local wiki database, not from the dump. |
| 9 | 9 | * |
| — | — | @@ -30,7 +30,6 @@ |
| 31 | 31 | $optionsWithArgs = array( 'report' ); |
| 32 | 32 | |
| 33 | 33 | require_once( 'commandLine.inc' ); |
| 34 | | -require_once( 'SpecialImport.php' ); |
| 35 | 34 | |
| 36 | 35 | class DumpRenderer { |
| 37 | 36 | function __construct( $dir ) { |
| Index: trunk/phase3/maintenance/dumpBackup.php |
| — | — | @@ -26,8 +26,7 @@ |
| 27 | 27 | $optionsWithArgs = array( 'pagelist', 'start', 'end' ); |
| 28 | 28 | |
| 29 | 29 | require_once( 'commandLine.inc' ); |
| 30 | | -require_once( 'SpecialExport.php' ); |
| 31 | | -require_once( 'maintenance/backup.inc' ); |
| | 30 | +require_once( 'backup.inc' ); |
| 32 | 31 | |
| 33 | 32 | $dumper = new BackupDumper( $argv ); |
| 34 | 33 | |
| Index: trunk/phase3/maintenance/dumpTextPass.php |
| — | — | @@ -24,8 +24,7 @@ |
| 25 | 25 | $originalDir = getcwd(); |
| 26 | 26 | |
| 27 | 27 | require_once( 'commandLine.inc' ); |
| 28 | | -require_once( 'SpecialExport.php' ); |
| 29 | | -require_once( 'maintenance/backup.inc' ); |
| | 28 | +require_once( 'backup.inc' ); |
| 30 | 29 | |
| 31 | 30 | /** |
| 32 | 31 | * Stream wrapper around 7za filter program. |
| Index: trunk/phase3/skins/MySkin.deps.php |
| — | — | @@ -8,6 +8,6 @@ |
| 9 | 9 | if ( ! defined( 'MEDIAWIKI' ) ) |
| 10 | 10 | die( 1 ); |
| 11 | 11 | |
| 12 | | -require_once('includes/SkinTemplate.php'); |
| | 12 | +require_once( dirname( dirname( __FILE__ ) ) . '/includes/SkinTemplate.php'); |
| 13 | 13 | require_once( dirname(__FILE__) . '/MonoBook.php' ); |
| 14 | 14 | ?> |
| Index: trunk/phase3/skins/Chick.deps.php |
| — | — | @@ -8,6 +8,6 @@ |
| 9 | 9 | if ( ! defined( 'MEDIAWIKI' ) ) |
| 10 | 10 | die( 1 ); |
| 11 | 11 | |
| 12 | | -require_once('includes/SkinTemplate.php'); |
| | 12 | +require_once( dirname( dirname( __FILE__ ) ) . '/includes/SkinTemplate.php'); |
| 13 | 13 | require_once( dirname(__FILE__) . '/MonoBook.php' ); |
| 14 | 14 | ?> |
| Index: trunk/phase3/skins/MonoBook.deps.php |
| — | — | @@ -8,5 +8,5 @@ |
| 9 | 9 | if ( ! defined( 'MEDIAWIKI' ) ) |
| 10 | 10 | die( 1 ); |
| 11 | 11 | |
| 12 | | -require_once('includes/SkinTemplate.php'); |
| | 12 | +require_once( dirname( dirname( __FILE__ ) ) . '/includes/SkinTemplate.php'); |
| 13 | 13 | ?> |
| Index: trunk/phase3/skins/Simple.deps.php |
| — | — | @@ -8,6 +8,6 @@ |
| 9 | 9 | if ( ! defined( 'MEDIAWIKI' ) ) |
| 10 | 10 | die( 1 ); |
| 11 | 11 | |
| 12 | | -require_once('includes/SkinTemplate.php'); |
| | 12 | +require_once( dirname( dirname( __FILE__ ) ) . '/includes/SkinTemplate.php'); |
| 13 | 13 | require_once( dirname(__FILE__) . '/MonoBook.php' ); |
| 14 | 14 | ?> |
| Index: trunk/phase3/skins/MonoBook.php |
| — | — | @@ -12,9 +12,6 @@ |
| 13 | 13 | if( !defined( 'MEDIAWIKI' ) ) |
| 14 | 14 | die( -1 ); |
| 15 | 15 | |
| 16 | | -/** */ |
| 17 | | -require_once('includes/SkinTemplate.php'); |
| 18 | | - |
| 19 | 16 | /** |
| 20 | 17 | * Inherit main code from SkinTemplate, set the CSS and template filter. |
| 21 | 18 | * @todo document |
| Index: trunk/phase3/includes/SpecialRecentchanges.php |
| — | — | @@ -269,8 +269,6 @@ |
| 270 | 270 | } |
| 271 | 271 | |
| 272 | 272 | function rcFilterByCategories ( &$rows , $categories , $any ) { |
| 273 | | - require_once ( 'Categoryfinder.php' ) ; |
| 274 | | - |
| 275 | 273 | # Filter categories |
| 276 | 274 | $cats = array () ; |
| 277 | 275 | foreach ( $categories AS $cat ) { |
| Index: trunk/phase3/includes/ExternalStore.php |
| — | — | @@ -41,10 +41,9 @@ |
| 42 | 42 | return false; |
| 43 | 43 | |
| 44 | 44 | $class='ExternalStore'.ucfirst($proto); |
| 45 | | - /* Preloaded modules might exist, especially ones serving multiple protocols */ |
| | 45 | + /* Any custom modules should be added to $wgAutoLoadClasses for on-demand loading */ |
| 46 | 46 | if (!class_exists($class)) { |
| 47 | | - if (!include_once($class.'.php')) |
| 48 | | - return false; |
| | 47 | + return false; |
| 49 | 48 | } |
| 50 | 49 | $store=new $class(); |
| 51 | 50 | return $store; |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -27,7 +27,7 @@ |
| 28 | 28 | * Create a site configuration object |
| 29 | 29 | * Not used for much in a default install |
| 30 | 30 | */ |
| 31 | | -require_once( 'includes/SiteConfiguration.php' ); |
| | 31 | +require_once( "$IP/includes/SiteConfiguration.php" ); |
| 32 | 32 | $wgConf = new SiteConfiguration; |
| 33 | 33 | |
| 34 | 34 | /** MediaWiki version number */ |
| Index: trunk/phase3/languages/classes/LanguageZh.php |
| — | — | @@ -7,7 +7,7 @@ |
| 8 | 8 | |
| 9 | 9 | class ZhConverter extends LanguageConverter { |
| 10 | 10 | function loadDefaultTables() { |
| 11 | | - require( "includes/ZhConversion.php" ); |
| | 11 | + require( dirname(__FILE__)."/../../includes/ZhConversion.php" ); |
| 12 | 12 | $this->mTables = array( |
| 13 | 13 | 'zh-cn' => new ReplacementArray( $zh2CN ), |
| 14 | 14 | 'zh-tw' => new ReplacementArray( $zh2TW ), |