summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2012-06-21 16:21:29 +0200
committerPhil Sturgeon <email@philsturgeon.co.uk>2012-06-21 16:21:29 +0200
commitcacabd6fac8a184723f5269643adc4c12ca1ab2f (patch)
tree7fa84f0f76f9c9d5b47f0ce3252754980a68083f /tests
parent3b6af434b13168828429d06aae7699f6f9537a87 (diff)
parent8d3099d4e5261e0f044c7fcd8b3ab7724645aa8d (diff)
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
Diffstat (limited to 'tests')
-rw-r--r--tests/codeigniter/helpers/date_helper_test.php6
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/codeigniter/helpers/date_helper_test.php b/tests/codeigniter/helpers/date_helper_test.php
index 8258c9248..4e01b1aa3 100644
--- a/tests/codeigniter/helpers/date_helper_test.php
+++ b/tests/codeigniter/helpers/date_helper_test.php
@@ -48,11 +48,9 @@ class Date_helper_test extends CI_TestCase {
*/
- $this->ci_set_config('time_reference', 'UTC');
-
$this->assertEquals(
- gmmktime(date('G'), date('i'), date('s'), date('n'), date('j'), date('Y')),
- now()
+ mktime(gmdate('G'), gmdate('i'), gmdate('s'), gmdate('n'), gmdate('j'), gmdate('Y')),
+ now('UTC')
);
}