From a74fd27e5f238f91f39be14056692945eecedabc Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 6 Jan 2010 11:35:01 -0800
Subject: Updated Kohana to r4737

---
 system/core/Benchmark.php        | 4 +---
 system/core/Event.php            | 4 +---
 system/core/Kohana.php           | 4 +---
 system/core/Kohana_Config.php    | 4 +---
 system/core/Kohana_Exception.php | 7 ++++---
 5 files changed, 8 insertions(+), 15 deletions(-)

(limited to 'system/core')

diff --git a/system/core/Benchmark.php b/system/core/Benchmark.php
index 4b2f78b0..79fadb6b 100644
--- a/system/core/Benchmark.php
+++ b/system/core/Benchmark.php
@@ -2,9 +2,7 @@
 /**
  * Simple benchmarking.
  *
- * $Id: Benchmark.php 4679 2009-11-10 01:45:52Z isaiah $
- *
- * @package    Core
+ * @package    Kohana
  * @author     Kohana Team
  * @copyright  (c) 2007-2009 Kohana Team
  * @license    http://kohanaphp.com/license
diff --git a/system/core/Event.php b/system/core/Event.php
index a9b88034..ab839f43 100644
--- a/system/core/Event.php
+++ b/system/core/Event.php
@@ -4,9 +4,7 @@
  * to be added to 'events'. Events can be run multiple times, and can also
  * process event-specific data. By default, Kohana has several system events.
  *
- * $Id: Event.php 4679 2009-11-10 01:45:52Z isaiah $
- *
- * @package    Core
+ * @package    Kohana
  * @author     Kohana Team
  * @copyright  (c) 2007-2009 Kohana Team
  * @license    http://kohanaphp.com/license
diff --git a/system/core/Kohana.php b/system/core/Kohana.php
index 29ca708c..ae056d0e 100644
--- a/system/core/Kohana.php
+++ b/system/core/Kohana.php
@@ -2,9 +2,7 @@
 /**
  * Provides Kohana-specific helper functions. This is where the magic happens!
  *
- * $Id: Kohana.php 4726 2009-12-23 18:58:53Z isaiah $
- *
- * @package    Core
+ * @package    Kohana
  * @author     Kohana Team
  * @copyright  (c) 2007-2009 Kohana Team
  * @license    http://kohanaphp.com/license
diff --git a/system/core/Kohana_Config.php b/system/core/Kohana_Config.php
index f961f391..9abc5b6c 100644
--- a/system/core/Kohana_Config.php
+++ b/system/core/Kohana_Config.php
@@ -3,9 +3,7 @@
  * Provides a driver-based interface for setting and getting
  * configuration options for the Kohana environment
  *
- * $Id: Kohana_Config.php 4679 2009-11-10 01:45:52Z isaiah $
- *
- * @package    KohanaConfig
+ * @package    Kohana
  * @author     Kohana Team
  * @copyright  (c) 2007-2009 Kohana Team
  * @license    http://kohanaphp.com/license
diff --git a/system/core/Kohana_Exception.php b/system/core/Kohana_Exception.php
index 0cbc472c..bc0efd18 100644
--- a/system/core/Kohana_Exception.php
+++ b/system/core/Kohana_Exception.php
@@ -2,9 +2,7 @@
 /**
  * Kohana Exceptions
  *
- * $Id: Kohana_Exception.php 4726 2009-12-23 18:58:53Z isaiah $
- *
- * @package    Core
+ * @package    Kohana
  * @author     Kohana Team
  * @copyright  (c) 2007-2009 Kohana Team
  * @license    http://kohanaphp.com/license
@@ -428,6 +426,9 @@ class Kohana_Exception_Core extends Exception {
 	 */
 	public static function debug_path($file)
 	{
+		// Normalize directory separator
+		$file = str_replace('\\', '/', $file);
+
 		if (strpos($file, APPPATH) === 0)
 		{
 			$file = 'APPPATH/'.substr($file, strlen(APPPATH));
-- 
cgit v1.2.3