summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2011-02-19 16:59:43 +0000
committerDries Buytaert <dries@buytaert.net>2011-02-19 16:59:43 +0000
commit9c44a600456dd50c845eb4d3fd8ba547d46b0960 (patch)
treef3de85592d91582ae90caaee003776ff7116b724 /modules
parente06aca78ece17aa3d1e301b3455de0d5f9ca79f7 (diff)
downloadbrdo-9c44a600456dd50c845eb4d3fd8ba547d46b0960.tar.gz
brdo-9c44a600456dd50c845eb4d3fd8ba547d46b0960.tar.bz2
- Rollback of accidentical commit #1064882.
Diffstat (limited to 'modules')
-rw-r--r--modules/simpletest/tests/common.test4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/simpletest/tests/common.test b/modules/simpletest/tests/common.test
index 52a8a7fe2..f48497559 100644
--- a/modules/simpletest/tests/common.test
+++ b/modules/simpletest/tests/common.test
@@ -2226,7 +2226,7 @@ class FormatDateUnitTest extends DrupalWebTestCase {
$real_language = $language->language;
$language->language = $user->language;
// Simulate a Drupal bootstrap with the logged-in user.
- drupal_set_configured_timezone();
+ date_default_timezone_set(drupal_get_user_timezone());
$this->assertIdentical(format_date($timestamp, 'custom', 'l, d-M-y H:i:s T', 'America/Los_Angeles', 'en'), 'Sunday, 25-Mar-07 17:00:00 PDT', t('Test a different language.'));
$this->assertIdentical(format_date($timestamp, 'custom', 'l, d-M-y H:i:s T', 'Europe/London'), 'Monday, 26-Mar-07 01:00:00 BST', t('Test a different time zone.'));
@@ -2240,7 +2240,7 @@ class FormatDateUnitTest extends DrupalWebTestCase {
$user = $real_user;
$language->language = $real_language;
// Restore default time zone.
- drupal_set_configured_timezone();
+ date_default_timezone_set(drupal_get_user_timezone());
drupal_save_session(TRUE);
}
}