Make location displayed by dd() identical to that by debug().

Refs #9989
cakephp · Jan 7, 2017 · 4cd0e96 · 4cd0e96
1 parent d4b1f92
commit 4cd0e96
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/basics.php b/src/basics.php
@@ -51,7 +51,10 @@ function debug($var, $showHtml = null, $showFrom = true)
         $line = '';
         $lineInfo = '';
         if ($showFrom) {
-            $trace = Debugger::trace(['start' => 1, 'depth' => 2, 'format' => 'array']);
+            $trace = Debugger::trace(['start' => 1, 'depth' => 3, 'format' => 'array']);
+            if (count($trace) > 1) {
+                array_shift($trace);
+            }
             $search = [];
             if (defined('ROOT')) {
                 $search = [ROOT];
@@ -171,8 +174,6 @@ function dd($var, $showHtml = null)
         }
 
         debug($var, $showHtml, false);
-        $backtrace = debug_backtrace(false, 1);
-        pr('dd-location: ' . $backtrace[0]['file'] . ':' . $backtrace[0]['line']);
         die(1);
     }
 }