Merge pull request #2438 from MashinaMashina/develop

Nice array view in debug toolbar
codeigniter4 · Dec 10, 2019 · 9ca9287 · 9ca9287
2 parents 2887cac + 68026f8
commit 9ca9287
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
@@ -136,7 +136,7 @@ public function run(float $startTime, float $totalTime, RequestInterface $reques
 			{
 				foreach ($items as $key => $value)
 				{
-					$varData[esc($key)] = is_string($value) ? esc($value) : print_r($value, true);
+					$varData[esc($key)] = is_string($value) ? esc($value) : '<pre>' . esc(print_r($value, true)) . '</pre>';
 				}
 			}
 
@@ -153,18 +153,18 @@ public function run(float $startTime, float $totalTime, RequestInterface $reques
 					$value = 'binary data';
 				}
 
-				$data['vars']['session'][esc($key)] = is_string($value) ? esc($value) : print_r($value, true);
+				$data['vars']['session'][esc($key)] = is_string($value) ? esc($value) : '<pre>' . esc(print_r($value, true)) . '</pre>';
 			}
 		}
 
 		foreach ($request->getGet() as $name => $value)
 		{
-			$data['vars']['get'][esc($name)] = is_array($value) ? esc(print_r($value, true)) : esc($value);
+			$data['vars']['get'][esc($name)] = is_array($value) ? '<pre>' . esc(print_r($value, true)) . '</pre>' : esc($value);
 		}
 
 		foreach ($request->getPost() as $name => $value)
 		{
-			$data['vars']['post'][esc($name)] = is_array($value) ? esc(print_r($value, true)) : esc($value);
+			$data['vars']['post'][esc($name)] = is_array($value) ? '<pre>' . esc(print_r($value, true)) . '</pre>' : esc($value);
 		}
 
 		foreach ($request->getHeaders() as $header => $value)

diff --git a/system/Debug/Toolbar/Views/toolbar.css b/system/Debug/Toolbar/Views/toolbar.css
@@ -37,6 +37,10 @@
 	z-index: 10000;
 }
 
+#debug-bar pre {
+    line-height: normal;
+}
+
 #debug-bar h1,
 #debug-bar h2,
 #debug-bar h3 {