Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into email

2 files changed, 6 insertions, 8 deletions

diff --git a/tests/codeigniter/database/query_builder/get_test.php b/tests/codeigniter/database/query_builder/get_test.php
index 699d2906a..156027537 100644
--- a/tests/codeigniter/database/query_builder/get_test.php
+++ b/tests/codeigniter/database/query_builder/get_test.php
@@ -41,7 +41,7 @@ class Get_test extends CI_TestCase {
 	 */
 	public function test_get_where()
 	{
-		$job1 = $this->db->get('job', array('id' => 1))->result_array();
+		$job1 = $this->db->get_where('job', array('id' => 1))->result_array();
 
 		// Dummy jobs contain 1 rows
 		$this->assertCount(1, $job1);
diff --git a/tests/codeigniter/helpers/date_helper_test.php b/tests/codeigniter/helpers/date_helper_test.php
index 1d397ac81..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')
 		);
 	}
 
@@ -196,9 +194,9 @@ class Date_helper_test extends CI_TestCase {
 	public function test_local_to_gmt()
 	{
 		$this->assertEquals(
-			gmmktime(
-				date('G', $this->time), date('i', $this->time), date('s', $this->time),
-				date('n', $this->time), date('j', $this->time), date('Y', $this->time)
+			mktime(
+				gmdate('G', $this->time), gmdate('i', $this->time), gmdate('s', $this->time),
+				gmdate('n', $this->time), gmdate('j', $this->time), gmdate('Y', $this->time)
 			),
 			local_to_gmt($this->time)
 		);