Merge pull request #1916 from daif/develop

jim-parry · web-flow · commit 7cfa78002104 · 2019-04-07T08:40:35.000-07:00
Check if the value is string
diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
@@ -141,7 +141,7 @@ 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))
+				if (is_string($value) && preg_match('~[^\x20-\x7E\t\r\n]~', $value))
 				{
 					$value = 'binary data';
 				}

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ public function run($startTime, $totalTime, $request, $response): string`
`141`	`141`	`foreach ($_SESSION as $key => $value)`
`142`	`142`	`{`
`143`	`143`	`// Replace the binary data with string to avoid json_encode failure.`
`144`		`- if (preg_match('~[^\x20-\x7E\t\r\n]~', $value))`
	`144`	`+ if (is_string($value) && preg_match('~[^\x20-\x7E\t\r\n]~', $value))`
`145`	`145`	`{`
`146`	`146`	`$value = 'binary data';`
`147`	`147`	`}`