[BUGFIX] Multiple InlineCSS overrides each other 79/51879/2
authorHaco <Nicolas.Scheidler@gmail.com>
Tue, 21 Feb 2017 12:01:09 +0000 (13:01 +0100)
committerGeorg Ringer <georg.ringer@gmail.com>
Tue, 28 Feb 2017 06:56:14 +0000 (07:56 +0100)
The 'Default CSS' (eg. from extensions) & 'Specific Page CSS'
(from TYPO3) can now be used together when "inlineStyle2TempFile = 0"
is set.

Resolves: #77534
Releases: master, 7.6
Change-Id: I22bb68938068a82691ce2132866ef191eac672fd
Reviewed-on: https://review.typo3.org/51879
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
typo3/sysext/frontend/Classes/Page/PageGenerator.php

index 73c8d19..414f26d 100644 (file)
@@ -403,12 +403,12 @@ class PageGenerator
                             $cssPageStyle = $tsfe->cObj->stdWrap($cssPageStyle, $iCSScode['_CSS_PAGE_STYLE.']);
                         }
                         $cssPageStyle = '/* specific page styles for extension "' . substr($key, 0, -1) . '" */' . LF . $cssPageStyle;
-                        self::addCssToPageRenderer($cssPageStyle, true);
+                        self::addCssToPageRenderer($cssPageStyle, true, 'InlinePageCss');
                     }
                 }
             }
             if (!empty($stylesFromPlugins)) {
-                self::addCssToPageRenderer($stylesFromPlugins);
+                self::addCssToPageRenderer($stylesFromPlugins, false, 'InlineDefaultCss');
             }
         }
         if ($tsfe->pSetup['stylesheet']) {