- Patch #1240320 by Chi: use __DIR__ instead of dirname(__FILE__).

Author: dbuytaert

includes/database/schema.inc

@@ -5,7 +5,7 @@
  * Generic Database schema code.
  */
 
-require_once dirname(__FILE__) . '/query.inc';
+require_once __DIR__ . '/query.inc';
 
 /**
  * @defgroup schemaapi Schema API

includes/database/select.inc

@@ -5,7 +5,7 @@
  * @{
  */
 
-require_once dirname(__FILE__) . '/query.inc';
+require_once __DIR__ . '/query.inc';
 
 /**
  * Interface for extendable query objects.

includes/filetransfer/filetransfer.inc

@@ -296,7 +296,7 @@ abstract class FileTransfer {
       return FALSE;
     }
 
-    $path = dirname(__FILE__);
+    $path = __DIR__;
     $path = $this->fixRemotePath($path, FALSE);
     $parts = explode('/', $path);
     $chroot = '';

scripts/dump-database-d6.sh

@@ -28,7 +28,7 @@ include_once './includes/bootstrap.inc';
 drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
 
 // Include the utility drupal_var_export() function.
-include_once dirname(__FILE__) . '/../includes/utility.inc';
+include_once __DIR__ . '/../includes/utility.inc';
 
 // Output the PHP header.
 $output = <<<ENDOFHEADER

scripts/run-tests.sh

@@ -297,7 +297,7 @@ function simpletest_script_init($server_software) {
     }
   }
 
-  chdir(realpath(dirname(__FILE__) . '/..'));
+  chdir(realpath(__DIR__ . '/..'));
   define('DRUPAL_ROOT', getcwd());
   require_once DRUPAL_ROOT . '/includes/bootstrap.inc';
 }