summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2011-02-19 13:24:32 +0000
committerDries Buytaert <dries@buytaert.net>2011-02-19 13:24:32 +0000
commit3e914018def1d59501a65857eb923f60f72afb79 (patch)
tree716b6ff31c592968001896a8acd9aed37c267015 /modules
parent570dcc57529acce8d6ced538af003afd140538fe (diff)
downloadbrdo-3e914018def1d59501a65857eb923f60f72afb79.tar.gz
brdo-3e914018def1d59501a65857eb923f60f72afb79.tar.bz2
- Patch #880278 by RoboPhred: cleanup _locale_import_read_po().
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 f48497559..52a8a7fe2 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.
- date_default_timezone_set(drupal_get_user_timezone());
+ drupal_set_configured_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.
- date_default_timezone_set(drupal_get_user_timezone());
+ drupal_set_configured_timezone();
drupal_save_session(TRUE);
}
}