diff options
| author | Dries Buytaert <dries@buytaert.net> | 2011-08-07 12:37:24 -0400 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2011-08-07 12:37:24 -0400 |
| commit | 132aed379c72f0702dd2e9c27cf9421f1435aba2 (patch) | |
| tree | 5bd7ae2d6658822f7354963aab3243b58c0885ff | |
| parent | 1e48014398e19d334bb0b6e5ac517265b575a6f4 (diff) | |
| download | brdo-132aed379c72f0702dd2e9c27cf9421f1435aba2.tar.gz brdo-132aed379c72f0702dd2e9c27cf9421f1435aba2.tar.bz2 | |
- Patch #1240320 by Chi: use __DIR__ instead of dirname(__FILE__).
| -rw-r--r-- | includes/database/schema.inc | 2 | ||||
| -rw-r--r-- | includes/database/select.inc | 2 | ||||
| -rw-r--r-- | includes/filetransfer/filetransfer.inc | 2 | ||||
| -rw-r--r-- | scripts/dump-database-d6.sh | 2 | ||||
| -rwxr-xr-x | scripts/run-tests.sh | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/includes/database/schema.inc b/includes/database/schema.inc index de1b2f5b9..f8221e3d6 100644 --- a/includes/database/schema.inc +++ b/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 diff --git a/includes/database/select.inc b/includes/database/select.inc index 53be20adc..7499e540f 100644 --- a/includes/database/select.inc +++ b/includes/database/select.inc @@ -5,7 +5,7 @@ * @{ */ -require_once dirname(__FILE__) . '/query.inc'; +require_once __DIR__ . '/query.inc'; /** * Interface for extendable query objects. diff --git a/includes/filetransfer/filetransfer.inc b/includes/filetransfer/filetransfer.inc index 2083da9d3..63e41230b 100644 --- a/includes/filetransfer/filetransfer.inc +++ b/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 = ''; diff --git a/scripts/dump-database-d6.sh b/scripts/dump-database-d6.sh index 41146b075..d39bb4306 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 dirname(__FILE__) . '/../includes/utility.inc'; +include_once __DIR__ . '/../includes/utility.inc'; // Output the PHP header. $output = <<<ENDOFHEADER diff --git a/scripts/run-tests.sh b/scripts/run-tests.sh index 02e897e41..dc4f2600f 100755 --- a/scripts/run-tests.sh +++ b/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'; } |