summaryrefslogtreecommitdiff
path: root/system/core/Kohana_Exception.php
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2010-01-06 17:05:00 -0800
committerBharat Mediratta <bharat@menalto.com>2010-01-06 17:05:00 -0800
commit10c05c855a1634a60048a52e8d90bc51f187ede7 (patch)
treeb65a9d3b2f2213503e3f143b18af6ebd831bc554 /system/core/Kohana_Exception.php
parent058a84ed76df96aeb6ec082d16fe0d8f317faac2 (diff)
parentded8fc593cccaf66236fb271a6d3f962d8c4b337 (diff)
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'system/core/Kohana_Exception.php')
-rw-r--r--system/core/Kohana_Exception.php7
1 files changed, 4 insertions, 3 deletions
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));