Merge branch 'develop'

melisplatform · Nov 19, 2020 · 0d2a33f · 0d2a33f
2 parents 2672847 + 624da58
commit 0d2a33f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Listener/MelisFrontLayoutListener.php b/src/Listener/MelisFrontLayoutListener.php
@@ -128,7 +128,7 @@ function(MvcEvent $e){
 
                             // Including the plugins menu by getting the view
                             $pluginsMenuView = $forwardPlugin->dispatch('MelisCms\Controller\FrontPlugins',
-                                array('action' => 'renderPluginsMenu', 'siteModule' => $siteModule));
+                                array('action' => 'renderPluginsMenu', 'siteModule' => $siteModule, 'pageId' => $idpage));
 
                             $viewRender = $this->getServiceManager()->get('ViewRenderer');
 

diff --git a/src/Listener/MelisFrontMiniTemplateConfigListener.php b/src/Listener/MelisFrontMiniTemplateConfigListener.php
@@ -111,7 +111,7 @@ public function onLoadModulesPost(ModuleEvent $e, $priority = 1)
      */
     public function prepareMiniTemplateConfig($miniTplPath)
     {
-        $image_ext = ['PNG', 'png', 'JPG', 'jpg', 'JPEG', 'jpeg'];
+        $image_ext = ['PNG', 'png', 'JPG', 'jpg', 'JPEG', 'jpeg', 'gif', 'GIF'];
         $pluginsFormat = array();
         foreach($miniTplPath as $siteName => $path) {
             if (file_exists($path) && is_dir($path)) {