Revert "Follow up on r43982. Reduce dirname(__FILE__) calls in core and extensions."

Uses $dir in extension files, and assumes that it remains unchanged in require_once( 'maintenance/commandLine.inc' ).
In fact, it is likely that '$dir' will be set when setting up command-line, as some extensions will use the same var.

Recommended fix: Use $CentralAuth_dir, $EmailPage_dir, etc.

diff --git a/img_auth.php b/img_auth.php
index f1214fe..4b625e3 100644 (file)
--- a/img_auth.php
+++ b/img_auth.php
@@ -13,10 +13,9 @@
  */
  
 define( 'MW_NO_OUTPUT_COMPRESSION', 1 );
-$dir = dirname(__FILE__) . '/';
-require_once( $dir . 'includes/WebStart.php' );
+require_once( dirname( __FILE__ ) . '/includes/WebStart.php' );
 wfProfileIn( 'img_auth.php' );
-require_once( $dir . 'includes/StreamFile.php' );
+require_once( dirname( __FILE__ ) . '/includes/StreamFile.php' );
 
 $perms = User::getGroupPermissions( array( '*' ) );
 if ( in_array( 'read', $perms, true ) ) {

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index fa2cc57..4430440 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -8,10 +8,9 @@ if ( !defined( 'MEDIAWIKI' ) ) {
  * Global functions used everywhere
  */
 
-$dir = dirname(__FILE__) . '/';
-require_once $dir . 'LogPage.php';
-require_once $dir . 'normal/UtfNormalUtil.php';
-require_once $dir . 'XmlFunctions.php';
+require_once dirname(__FILE__) . '/LogPage.php';
+require_once dirname(__FILE__) . '/normal/UtfNormalUtil.php';
+require_once dirname(__FILE__) . '/XmlFunctions.php';
 
 // Hide compatibility functions from Doxygen
 /// @cond

diff --git a/languages/classes/LanguageKk.deps.php b/languages/classes/LanguageKk.deps.php
index 9a76de0..aa7361b 100644 (file)
--- a/languages/classes/LanguageKk.deps.php
+++ b/languages/classes/LanguageKk.deps.php
@@ -5,6 +5,5 @@
 // changed on a subsequent page view.
 // see http://lists.wikimedia.org/pipermail/wikitech-l/2006-January/021311.html
 
-$dir = dirname(__FILE__) . '/';
-require_once( $dir . '../LanguageConverter.php' );
-require_once( $dir . 'LanguageKk_cyrl.php' );
+require_once( dirname(__FILE__).'/../LanguageConverter.php' );
+require_once( dirname(__FILE__).'/LanguageKk_cyrl.php' );

diff --git a/languages/classes/LanguageKk.php b/languages/classes/LanguageKk.php
index c862c3b..40beca6 100644 (file)
--- a/languages/classes/LanguageKk.php
+++ b/languages/classes/LanguageKk.php
@@ -1,8 +1,7 @@
 <?php
 
-$dir = dirname(__FILE__) . '/';
-require_once( $dir . '../LanguageConverter.php' );
-require_once( $dir . 'LanguageKk_cyrl.php' );
+require_once( dirname(__FILE__).'/../LanguageConverter.php' );
+require_once( dirname(__FILE__).'/LanguageKk_cyrl.php' );
 
 define( 'KK_C_UC', 'АӘБВГҒДЕЁЖЗИЙКҚЛМНҢОӨПРСТУҰҮФХҺЦЧШЩЪЫІЬЭЮЯ' ); # Kazakh Cyrillic uppercase
 define( 'KK_C_LC', 'аәбвгғдеёжзийкқлмнңоөпрстуұүфхһцчшщъыіьэюя' ); # Kazakh Cyrillic lowercase

diff --git a/languages/classes/LanguageKu.deps.php b/languages/classes/LanguageKu.deps.php
index 43650dd..43e2916 100644 (file)
--- a/languages/classes/LanguageKu.deps.php
+++ b/languages/classes/LanguageKu.deps.php
@@ -5,6 +5,5 @@
 // changed on a subsequent page view.
 // see http://lists.wikimedia.org/pipermail/wikitech-l/2006-January/021311.html
 
-$dir = dirname(__FILE__) . '/';
-require_once( $dir . '../LanguageConverter.php' );
-require_once( $dir . 'LanguageKu_ku.php' );
+require_once( dirname(__FILE__).'/../LanguageConverter.php' );
+require_once( dirname(__FILE__).'/LanguageKu_ku.php' );

diff --git a/languages/classes/LanguageSr.deps.php b/languages/classes/LanguageSr.deps.php
index 0fbda0d..ffdd234 100644 (file)
--- a/languages/classes/LanguageSr.deps.php
+++ b/languages/classes/LanguageSr.deps.php
@@ -5,6 +5,5 @@
 // changed on a subsequent page view.
 // see http://lists.wikimedia.org/pipermail/wikitech-l/2006-January/021311.html
 
-$dir = dirname(__FILE__) . '/';
-require_once( $dir . 'LanguageSr_ec.php' );
-require_once( $dir . '../LanguageConverter.php' );
+require_once( dirname(__FILE__).'/LanguageSr_ec.php' );
+require_once( dirname(__FILE__).'/../LanguageConverter.php' );

diff --git a/languages/classes/LanguageSr.php b/languages/classes/LanguageSr.php
index 0af882b..781218c 100644 (file)
--- a/languages/classes/LanguageSr.php
+++ b/languages/classes/LanguageSr.php
@@ -1,9 +1,8 @@
 <?php
 
-$dir = dirname(__FILE__) . '/';
-require_once( $dir . '../LanguageConverter.php' );
-require_once( $dir . 'LanguageSr_ec.php' );
-require_once( $dir . 'LanguageSr_el.php' );
+require_once( dirname(__FILE__).'/../LanguageConverter.php' );
+require_once( dirname(__FILE__).'/LanguageSr_ec.php' );
+require_once( dirname(__FILE__).'/LanguageSr_el.php' );
 
 /**
  * There are two levels of conversion for Serbian: the script level

diff --git a/languages/classes/LanguageZh.deps.php b/languages/classes/LanguageZh.deps.php
index d23c9c5..542170a 100644 (file)
--- a/languages/classes/LanguageZh.deps.php
+++ b/languages/classes/LanguageZh.deps.php
@@ -5,6 +5,5 @@
 // changed on a subsequent page view.
 // see http://lists.wikimedia.org/pipermail/wikitech-l/2006-January/021311.html
 
-$dir = dirname(__FILE__) . '/';
-require_once( $dir . 'LanguageZh_hans.php' );
-require_once( $dir . '../LanguageConverter.php' );
\ No newline at end of file
+require_once( dirname(__FILE__).'/LanguageZh_hans.php' );
+require_once( dirname(__FILE__).'/../LanguageConverter.php' );

diff --git a/languages/classes/LanguageZh.php b/languages/classes/LanguageZh.php
index 0ba1ad9..0936269 100644 (file)
--- a/languages/classes/LanguageZh.php
+++ b/languages/classes/LanguageZh.php
@@ -1,8 +1,7 @@
 <?php
 
-$dir = dirname(__FILE__) . '/';
-require_once( $dir . '../LanguageConverter.php' );
-require_once( $dir . 'LanguageZh_hans.php' );
+require_once( dirname(__FILE__).'/../LanguageConverter.php' );
+require_once( dirname(__FILE__).'/LanguageZh_hans.php' );
 
 /**
  * @ingroup Language