From e15e3dde9dca15e2d65f098010d3fb7004cef5e7 Mon Sep 17 00:00:00 2001
From: Iban Eguia <admin@razican.com>
Date: Sat, 9 Jun 2012 23:52:27 +0200
Subject: Fixed timezone change in index.php Now it does not ever change the
 local timezone, and it adds the option to get the 'local' time()

---
 system/helpers/date_helper.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'system/helpers/date_helper.php')

diff --git a/system/helpers/date_helper.php b/system/helpers/date_helper.php
index 3b0c3289d..d5acec23f 100644
--- a/system/helpers/date_helper.php
+++ b/system/helpers/date_helper.php
@@ -57,10 +57,16 @@ if ( ! function_exists('now'))
 			$timezone	= $CI->config->item('timezone');
 		}
 
-		$timezone	= new DateTimeZone($timezone);
-		$now		= new DateTime('now', $timezone);
-		$offset		= $timezone->getOffset($now);
-		$time		= time() + $offset;
+		$time			= time();
+		if(strtolower($timezone) != 'local')
+		{
+			$local		= new DateTime(NULL, new DateTimeZone(date_default_timezone_get()));
+			$now		= new DateTime(NULL, new DateTimeZone($timezone));
+			$lcl_offset	= $local->getOffset();
+			$tz_offset	= $now->getOffset();
+			$offset		= $tz_offset - $lcl_offset;
+			$time		= $time + $offset;
+		}
 
 		return $time;
 	}
-- 
cgit v1.2.3-24-g4f1b