diff options
author | Nathan Kinkade <nkinkade@nkinka.de> | 2010-01-09 23:02:55 +0000 |
---|---|---|
committer | Nathan Kinkade <nkinkade@nkinka.de> | 2010-01-09 23:02:55 +0000 |
commit | 0a67b836a9b5021c91b9c327d3693991c3248dfc (patch) | |
tree | 91f49ca62a9ffd586e01bde700068f87e884181a /system/core/Kohana_Exception.php | |
parent | 232c0b7fd0df7f84543bc29380a0734ef1e84a02 (diff) | |
parent | bd9f945e3f2de4ea2402bd3941dba69c79ddc5a4 (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.php | 7 |
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)); |