diff --git a/application/Filters/DebugToolbar.php b/application/Filters/DebugToolbar.php
index 878a52387923..d28b45554a19 100644
--- a/application/Filters/DebugToolbar.php
+++ b/application/Filters/DebugToolbar.php
@@ -71,9 +71,11 @@ public function after(RequestInterface $request, ResponseInterface $response)
}
$script = PHP_EOL
- . ''
+ . ''
+ . ''
. PHP_EOL;
if (strpos($response->getBody(), '') !== false)
diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
index ce96b098277d..7f46f354ae24 100644
--- a/system/Debug/Toolbar.php
+++ b/system/Debug/Toolbar.php
@@ -196,6 +196,11 @@ public function run($startTime, $totalTime, $request, $response): string
$data['config'] = \CodeIgniter\Debug\Toolbar\Collectors\Config::display();
+ if( $response->CSP !== null )
+ {
+ $response->CSP->addImageSrc( 'data:' );
+ }
+
return json_encode($data);
}
@@ -273,6 +278,7 @@ protected static function format(string $data, string $format = 'html')
switch ($format)
{
case 'html':
+ $data['styles'] = [];
extract($data);
$parser = Services::parser(BASEPATH . 'Debug/Toolbar/Views/', null,false);
ob_start();
@@ -283,8 +289,6 @@ protected static function format(string $data, string $format = 'html')
case 'json':
$output = json_encode($data);
break;
- case 'json':
- $output = json_encode($data);
case 'xml':
$formatter = new XMLFormatter;
$output = $formatter->format($data);
@@ -306,27 +310,31 @@ protected static function format(string $data, string $format = 'html')
*
* @return string
*/
- protected static function renderTimeline(array $collectors, $startTime, int $segmentCount, int $segmentDuration): string
+ protected static function renderTimeline(array $collectors, $startTime, int $segmentCount, int $segmentDuration, array& $styles ): string
{
$displayTime = $segmentCount*$segmentDuration;
$rows = self::collectTimelineData($collectors);
$output = '';
+ $styleCount = 0;
foreach ($rows as $row)
{
$output .= "