diff --git a/system/Debug/Toolbar/Collectors/History.php b/system/Debug/Toolbar/Collectors/History.php index 062d160d58..14788a37ad 100644 --- a/system/Debug/Toolbar/Collectors/History.php +++ b/system/Debug/Toolbar/Collectors/History.php @@ -104,22 +104,25 @@ class History extends BaseCollector // Get the contents of this specific history request $contents = file_get_contents($filename); - $contents = json_decode($contents); - \preg_match_all('/\d+/', $filename, $time); - $time = (int)$time[0][0]; + $contents = @json_decode($contents); + if(json_last_error() === JSON_ERROR_NONE) + { + preg_match_all('/\d+/', $filename, $time); + $time = (int)$time[0][0]; - // Debugbar files shown in History Collector - $files[] = [ - 'time' => $time, - 'datetime' => date('Y-m-d H:i:s', $time), - 'active' => $time === $current, - 'status' => $contents->vars->response->statusCode, - 'method' => $contents->method, - 'url' => $contents->url, - 'isAJAX' => $contents->isAJAX ? 'Yes' : 'No', - 'contentType' => $contents->vars->response->contentType, - ]; + // Debugbar files shown in History Collector + $files[] = [ + 'time' => $time, + 'datetime' => date('Y-m-d H:i:s', $time), + 'active' => $time === $current, + 'status' => $contents->vars->response->statusCode, + 'method' => $contents->method, + 'url' => $contents->url, + 'isAJAX' => $contents->isAJAX ? 'Yes' : 'No', + 'contentType' => $contents->vars->response->contentType, + ]; + } } $this->files = $files;