Avoid notice thrown in debug().

cakephp · Sep 16, 2014 · 21fbb97 · 21fbb97
1 parent 6e8f607
commit 21fbb97
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/basics.php b/src/basics.php
@@ -52,7 +52,11 @@ function debug($var, $showHtml = null, $showFrom = true) {
 		$lineInfo = '';
 		if ($showFrom) {
 			$trace = Debugger::trace(array('start' => 1, 'depth' => 2, 'format' => 'array'));
-			$file = str_replace(array(CAKE_CORE_INCLUDE_PATH, ROOT), '', $trace[0]['file']);
+			$search = array(ROOT);
+			if (defined('CAKE_CORE_INCLUDE_PATH')) {
+				array_unshift($search, CAKE_CORE_INCLUDE_PATH);
+			}
+			$file = str_replace($search, '', $trace[0]['file']);
 			$line = $trace[0]['line'];
 		}
 		$html = <<<HTML