From fdba874484298fc5910917aa284d4b6451ecc82b Mon Sep 17 00:00:00 2001 From: Sethorax Date: Mon, 22 May 2017 18:27:48 +0200 Subject: [PATCH] [BUGFIX] Fixed bug where inline css setting would parse non string values --- Classes/Hook/RenderPostProcessorHook.php | 32 +++++++++++++----------- composer.json | 2 +- ext_emconf.php | 2 +- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/Classes/Hook/RenderPostProcessorHook.php b/Classes/Hook/RenderPostProcessorHook.php index 9fb90bb..a2805d1 100644 --- a/Classes/Hook/RenderPostProcessorHook.php +++ b/Classes/Hook/RenderPostProcessorHook.php @@ -130,22 +130,24 @@ protected function includeCssInline($settings, $pos) foreach ($settings as $key => $value) { $rawCss = $this->getSettingContent($settings, $key, $value); - if ($this->settings['minifyCSS'] === '1') { - $minifier = new MinificationUtility(); - $css = $minifier->setMode('css') - ->addContent($rawCss) - ->minifyToString(); - } else { - $css = $rawCss; - } + if (!is_array($rawCss)) { + if ($this->settings['minifyCSS'] === '1') { + $minifier = new MinificationUtility(); + $css = $minifier->setMode('css') + ->addContent($rawCss) + ->minifyToString(); + } else { + $css = $rawCss; + } - if (!empty($css)) { - $tag = new TagRenderer(); - $this->params[$pos][] = - trim($tag->create('style') - ->setContent($css) - ->addAttribute('assetloader-' . $key) - ->renderToString()); + if (!empty($css)) { + $tag = new TagRenderer(); + $this->params[$pos][] = + trim($tag->create('style') + ->setContent($css) + ->addAttribute('assetloader-' . $key) + ->renderToString()); + } } } } diff --git a/composer.json b/composer.json index 0be3f64..e120711 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "sethorax/typo3-assetloader", "description": "Pagespeed friendly asset loader for TYPO3 CMS", "type": "typo3-cms-extension", - "version": "0.9.2", + "version": "0.9.3", "license": "GPL-3.0+", "keywords": [ "TYPO3", diff --git a/ext_emconf.php b/ext_emconf.php index 97c40ae..f86644e 100644 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -4,7 +4,7 @@ 'title' => 'Assetloader', 'description' => 'Pagespeed friendly asset loader.', 'category' => 'frontend', - 'version' => '0.9.2', + 'version' => '0.9.3', 'state' => 'beta', 'uploadfolder' => 0, 'createDirs' => 'typo3temp/assetloader',