Merge pull request #1897 from atishamte/toolbar

Toolbar fix w.r.t #1779
codeigniter4 · Apr 1, 2019 · 87d848c · 87d848c
2 parents b1820ed + a9cf036
commit 87d848c
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
@@ -140,6 +140,12 @@ public function run($startTime, $totalTime, $request, $response): string
 		{
 			foreach ($_SESSION as $key => $value)
 			{
+				// Replace the binary data with string to avoid json_encode failure.
+				if (preg_match('~[^\x20-\x7E\t\r\n]~', $value))
+				{
+					$value = 'binary data';
+				}
+
 				$data['vars']['session'][esc($key)] = is_string($value) ? esc($value) : print_r($value, true);
 			}
 		}