backported fix for custom theme-specific block templates

zikula · Dec 6, 2018 · d30b0ad · d30b0ad
1 parent 69c634e
commit d30b0ad
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/CHANGELOG-2.0.md b/CHANGELOG-2.0.md
@@ -8,6 +8,9 @@ CHANGELOG - ZIKULA 2.0.x
     - Disclosure of uploaded files full path (CVE-2018-19789).
     - Open Redirect Vulnerability when using Security\Http (CVE-2018-19790).
 
+ - Fixes:
+    - Fixed broken support for custom block templates in themes.
+
  - Vendor updates:
     - composer/ca-bundle updated from 1.1.2 to 1.1.3
     - composer/installers updated from 1.5.0 to 1.6.0

diff --git a/src/system/ThemeModule/Engine/Engine.php b/src/system/ThemeModule/Engine/Engine.php
@@ -136,6 +136,8 @@ public function wrapResponseInTheme(Response $response)
      */
     public function wrapBlockContentInTheme($content, $title, $blockType, $bid, $positionName)
     {
+        $content = $this->getTheme()->generateThemedBlockContent($this->getRealm(), $positionName, $content, $title);
+
         $themeConfig = $this->getTheme()->getConfig();
         $wrap = isset($themeConfig['blockWrapping']) ? $themeConfig['blockWrapping'] : true;