~ fix last style tag position

+ added data: to image source (csp) -> fix icons not shown Signed-off-by: Christoph Potas <christoph286@googlemail.com>
codeigniter4 · Aug 2, 2018 · 14328f9 · 14328f9
1 parent 37ba642
commit 14328f9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git 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);
 	}
 

diff --git a/system/Debug/Toolbar/Views/toolbar.tpl.php b/system/Debug/Toolbar/Views/toolbar.tpl.php
@@ -270,11 +270,11 @@
 
 		<?= $parser->setData($config)->render('_config.tpl') ?>
 	</div>
-	<style type="text/css">
-		<?php foreach( $styles as $name => $style ) : ?>
-		.<?= $name ?> {
-			<?= $style ?>
-		}
-		<?php endforeach ?>
-	</style>
 </div>
+<style type="text/css">
+	<?php foreach( $styles as $name => $style ) : ?>
+	.<?= $name ?> {
+	<?= $style ?>
+	}
+	<?php endforeach ?>
+</style>