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/FancyCaptcha.php b/FancyCaptcha.php
index 14a63418dbd1d68e62e1e9a8faa0edd04aeb6728..3d300fc1db196afd761a0d54eeb3ecf98f8ae454 100644 (file)
--- a/FancyCaptcha.php
+++ b/FancyCaptcha.php
@@ -37,6 +37,6 @@ $wgCaptchaDirectoryLevels = 0; // To break into subdirectories
 global $wgCaptchaSecret;
 $wgCaptchaSecret = "CHANGE_THIS_SECRET!";
 
-$dir = dirname(__FILE__) . '/';
-$wgExtensionMessagesFiles['FancyCaptcha'] = $dir . 'FancyCaptcha.i18n.php';
-$wgAutoloadClasses['FancyCaptcha'] = $dir . 'FancyCaptcha.class.php';
+$wgExtensionMessagesFiles['FancyCaptcha'] = dirname(__FILE__).'/FancyCaptcha.i18n.php';
+$wgAutoloadClasses['FancyCaptcha'] = dirname( __FILE__ ) . '/FancyCaptcha.class.php';
+