Merge tag '4.4' into develop

Version 4.4
netzmacht-archive · Jun 24, 2014 · 0708599 · 0708599
2 parents 074e40d + e91ad68
commit 0708599
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/contao/dca/tl_page.php b/contao/dca/tl_page.php
@@ -24,7 +24,7 @@
     $GLOBALS['TL_DCA']['tl_page']['palettes']['__selector__'][] = 'theme_plus_include_javascripts_noinherit';
 
     $GLOBALS['TL_DCA']['tl_page']['palettes'][$strType] = preg_replace(
-        '#({layout_legend:hide}.*);#U',
+        '#({layout_legend(:hide)?}.*);#U',
         '$1,theme_plus_include_stylesheets,theme_plus_include_stylesheets_noinherit,theme_plus_include_javascripts,theme_plus_include_javascripts_noinherit;',
         $GLOBALS['TL_DCA']['tl_page']['palettes'][$strType]
     );

diff --git a/src/Bit3/Contao/ThemePlus/Filter/ContaoInsertTagFilter.php b/src/Bit3/Contao/ThemePlus/Filter/ContaoInsertTagFilter.php
@@ -20,6 +20,14 @@ class ContaoInsertTagFilter
     extends \Controller
     implements \Assetic\Filter\FilterInterface
 {
+    /**
+     * As the \Controller class extends the \System class which has a protected __construct
+     * we have to override the constructor to make it available
+     */
+    public function __construct() {
+        return parent::__construct();
+    }
+
     /**
      * Filters an asset after it has been loaded.
      *

diff --git a/src/Bit3/Contao/ThemePlus/Filter/ThemePlusFilterFactory.php b/src/Bit3/Contao/ThemePlus/Filter/ThemePlusFilterFactory.php
@@ -29,6 +29,9 @@ public function createFilter(array $filterConfig)
             case 'contaoReplaceVariable':
                 $filter = new ContaoReplaceVariableFilter();
                 break;
+            case 'contaoInsertTag':
+                $filter = new ContaoInsertTagFilter();
+                break;
         }
 
         if($filter === null)

diff --git a/src/Bit3/Contao/ThemePlus/ThemePlus.php b/src/Bit3/Contao/ThemePlus/ThemePlus.php
@@ -57,6 +57,7 @@ public static function getInstance()
 				$_SESSION['THEME_PLUS_ASSETS'] = array();
 			}
 
+			// Add new assetic filter factory
 			AsseticFactory::registerFilterFactory(new Filter\ThemePlusFilterFactory());
 		}
 		return static::$instance;