summaryrefslogtreecommitdiff
path: root/modules/simpletest
diff options
context:
space:
mode:
Diffstat (limited to 'modules/simpletest')
-rw-r--r--modules/simpletest/drupal_web_test_case.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/simpletest/drupal_web_test_case.php b/modules/simpletest/drupal_web_test_case.php
index 3b42342c1..abb90bcbc 100644
--- a/modules/simpletest/drupal_web_test_case.php
+++ b/modules/simpletest/drupal_web_test_case.php
@@ -831,6 +831,7 @@ class DrupalWebTestCase {
// Store necessary current values before switching to prefixed database.
$this->originalPrefix = $db_prefix;
+ $this->originalFileDirectory = file_directory_path();
$clean_url_original = variable_get('clean_url', 0);
// Generate temporary prefixed database to ensure that tests have a clean starting point.
@@ -874,8 +875,7 @@ class DrupalWebTestCase {
variable_set('site_mail', 'simpletest@example.com');
// Use temporary files directory with the same prefix as database.
- $this->originalFileDirectory = file_directory_path();
- variable_set('file_directory_path', file_directory_path() . '/' . $db_prefix);
+ variable_set('file_directory_path', $this->originalFileDirectory . '/' . $db_prefix);
$directory = file_directory_path();
// Create the files directory.
file_check_directory($directory, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS);