Patching Kohana_Log to maintain backwards compatability with 3.0.x se…

…ries
kohana · Sep 5, 2010 · b36d69c · b36d69c
1 parent 09b8bb1
commit b36d69c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/classes/kohana/date.php b/classes/kohana/date.php
@@ -542,12 +542,13 @@ public static function dos2unix($timestamp = FALSE)
 	 * @param   string  timestamp_format timestamp format
 	 * @return  string
 	 */
-	public static function formatted_time($datetime_str = 'now', $timestamp_format = NULL)
+	public static function formatted_time($datetime_str = 'now', $timestamp_format = NULL, $timezone = NULL)
 	{
 		$timestamp_format = $timestamp_format == NULL ? Date::$timestamp_format : $timestamp_format;
-
+		$timezone         = $timezone === NULL ? Date::$timezone : $timezone;
+
 		$time = new DateTime($datetime_str, new DateTimeZone(
-			Date::$timezone ? Date::$timezone : date_default_timezone_get()
+			$timezone ? $timezone : date_default_timezone_get()
 		));
 
 		return $time->format($timestamp_format);

diff --git a/classes/kohana/log.php b/classes/kohana/log.php
@@ -18,6 +18,12 @@ class Kohana_Log {
 	 */
 	public static $timestamp = 'Y-m-d H:i:s';
 
+	/**
+	 * Timezone for log entries
+	 * @var string
+	 */
+	public static $timezone;
+
 	/**
 	 * Singleton instance container
 	 * @var Kohana_Log
@@ -112,7 +118,7 @@ public function add($type, $message, array $values = NULL)
 		// Create a new message and timestamp it
 		$this->_messages[] = array
 		(
-			'time' => Date::formatted_time('now', self::$timestamp),
+			'time' => Date::formatted_time('now', self::$timestamp, self::$timezone),
 			'type' => $type,
 			'body' => $message,
 		);