summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDries Buytaert2011-08-07 16:39:05 (GMT)
committer Dries Buytaert2011-08-07 16:39:05 (GMT)
commit1e7a7361c412ed14ffe3285e0588cd6d823a1934 (patch)
tree11b0e38f2cf212ca48bfb8946c3f446abe354061
parent132aed379c72f0702dd2e9c27cf9421f1435aba2 (diff)
Revert "- Patch #1240320 by Chi: use __DIR__ instead of dirname(__FILE__)."
This reverts commit 132aed379c72f0702dd2e9c27cf9421f1435aba2.
-rw-r--r--includes/database/schema.inc2
-rw-r--r--includes/database/select.inc2
-rw-r--r--includes/filetransfer/filetransfer.inc2
-rw-r--r--scripts/dump-database-d6.sh2
-rwxr-xr-xscripts/run-tests.sh2
5 files changed, 5 insertions, 5 deletions
diff --git a/includes/database/schema.inc b/includes/database/schema.inc
index f8221e3..de1b2f5 100644
--- a/includes/database/schema.inc
+++ b/includes/database/schema.inc
@@ -5,7 +5,7 @@
* Generic Database schema code.
*/
-require_once __DIR__ . '/query.inc';
+require_once dirname(__FILE__) . '/query.inc';
/**
* @defgroup schemaapi Schema API
diff --git a/includes/database/select.inc b/includes/database/select.inc
index 7499e54..53be20a 100644
--- a/includes/database/select.inc
+++ b/includes/database/select.inc
@@ -5,7 +5,7 @@
* @{
*/
-require_once __DIR__ . '/query.inc';
+require_once dirname(__FILE__) . '/query.inc';
/**
* Interface for extendable query objects.
diff --git a/includes/filetransfer/filetransfer.inc b/includes/filetransfer/filetransfer.inc
index 63e4123..2083da9 100644
--- a/includes/filetransfer/filetransfer.inc
+++ b/includes/filetransfer/filetransfer.inc
@@ -296,7 +296,7 @@ abstract class FileTransfer {
return FALSE;
}
- $path = __DIR__;
+ $path = dirname(__FILE__);
$path = $this->fixRemotePath($path, FALSE);
$parts = explode('/', $path);
$chroot = '';
diff --git a/scripts/dump-database-d6.sh b/scripts/dump-database-d6.sh
index d39bb43..41146b0 100644
--- a/scripts/dump-database-d6.sh
+++ b/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 __DIR__ . '/../includes/utility.inc';
+include_once dirname(__FILE__) . '/../includes/utility.inc';
// Output the PHP header.
$output = <<<ENDOFHEADER
diff --git a/scripts/run-tests.sh b/scripts/run-tests.sh
index dc4f260..02e897e 100755
--- a/scripts/run-tests.sh
+++ b/scripts/run-tests.sh
@@ -297,7 +297,7 @@ function simpletest_script_init($server_software) {
}
}
- chdir(realpath(__DIR__ . '/..'));
+ chdir(realpath(dirname(__FILE__) . '/..'));
define('DRUPAL_ROOT', getcwd());
require_once DRUPAL_ROOT . '/includes/bootstrap.inc';
}