Skip to content
Snippets Groups Projects
Commit 1e7a7361 authored by Dries Buytaert's avatar Dries Buytaert
Browse files

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

This reverts commit 132aed37.
parent 132aed37
No related branches found
No related tags found
No related merge requests found
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* Generic Database schema code. * Generic Database schema code.
*/ */
require_once __DIR__ . '/query.inc'; require_once dirname(__FILE__) . '/query.inc';
/** /**
* @defgroup schemaapi Schema API * @defgroup schemaapi Schema API
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* @{ * @{
*/ */
require_once __DIR__ . '/query.inc'; require_once dirname(__FILE__) . '/query.inc';
/** /**
* Interface for extendable query objects. * Interface for extendable query objects.
......
...@@ -296,7 +296,7 @@ function findChroot() { ...@@ -296,7 +296,7 @@ function findChroot() {
return FALSE; return FALSE;
} }
$path = __DIR__; $path = dirname(__FILE__);
$path = $this->fixRemotePath($path, FALSE); $path = $this->fixRemotePath($path, FALSE);
$parts = explode('/', $path); $parts = explode('/', $path);
$chroot = ''; $chroot = '';
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL); drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
// Include the utility drupal_var_export() function. // Include the utility drupal_var_export() function.
include_once __DIR__ . '/../includes/utility.inc'; include_once dirname(__FILE__) . '/../includes/utility.inc';
// Output the PHP header. // Output the PHP header.
$output = <<<ENDOFHEADER $output = <<<ENDOFHEADER
......
...@@ -297,7 +297,7 @@ function simpletest_script_init($server_software) { ...@@ -297,7 +297,7 @@ function simpletest_script_init($server_software) {
} }
} }
chdir(realpath(__DIR__ . '/..')); chdir(realpath(dirname(__FILE__) . '/..'));
define('DRUPAL_ROOT', getcwd()); define('DRUPAL_ROOT', getcwd());
require_once DRUPAL_ROOT . '/includes/bootstrap.inc'; require_once DRUPAL_ROOT . '/includes/bootstrap.inc';
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment