Merge pull request #1869 from atishamte/history

History::SetFiles check #1778

Author: lonnieezell

system/Debug/Toolbar/Collectors/History.php

@@ -104,22 +104,25 @@ public function setFiles(int $current, int $limit = 20)
 
 			// 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];
-
-			// 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,
-			];
+
+			$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,
+				];
+			}
 		}
 
 		$this->files = $files;