Update AbstractHandler.php

WebFiori · Sep 21, 2022 · a3e8d8f · a3e8d8f
1 parent 8c813ae
commit a3e8d8f
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/src/webfiori/error/AbstractHandler.php b/src/webfiori/error/AbstractHandler.php
@@ -141,9 +141,22 @@ private function setTrace() {
             $this->traceArr = $ex->getDebugTrace();
         } else {
             $trace = $ex->getTrace();
-
+            $currentLine = isset($trace[0]['line']) ? $trace[0]['line'] : 'X';
+            $currentFile = isset($trace[0]['file']) ? $trace[0]['file'] : 'X';
+            $nextLine = '';
+            $nextFile = '';
+            $idx = 0;
             foreach ($trace as $traceEntry) {
-                $this->traceArr[] = new TraceEntry($traceEntry);
+                if ($idx != 0) {
+                    $nextFile = isset($traceEntry['file']) ? $traceEntry['file'] : 'X';
+                    $nextLine = isset($traceEntry['line']) ? $traceEntry['line'] : 'X';
+                    $traceEntry['file'] = $currentFile;
+                    $traceEntry['line'] = $currentLine;
+                    $this->traceArr[] = new TraceEntry($traceEntry);
+                    $currentFile = $nextFile;
+                    $currentLine = $nextLine;
+                }
+                $idx++;
             }
         }
     }