Merge branch 'hotfix/farm-php-fatal-and-warnings' into develop

giterlizzi · Jul 10, 2019 · 8ebb26d · 8ebb26d
2 parents bff1d26 + 869d9a2
commit 8ebb26d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/Template.php b/Template.php
@@ -2257,11 +2257,20 @@ public function normalizeContent($content)
 
                     $plugin_name = $matches[1];
 
-                    $extension = plugin_load('helper', 'extension_extension');
-                    $extension->setExtension($plugin_name);
+                    if ($extension = plugin_load('helper', 'extension_extension')) {
 
-                    foreach ($elm->find('legend') as $legend) {
-                        $legend->innertext = '<i class="mdi mdi-puzzle text-success"></i> '. $legend->innertext .' <br/><h6>'. $extension->getDescription() .' <a class="urlextern" href="'. $extension->getURL() .'" target="_blank">Docs</a></h6>';
+                        if ($extension->setExtension($plugin_name)) {
+
+                            foreach ($elm->find('legend') as $legend) {
+                                $legend->innertext = '<i class="mdi mdi-puzzle text-success"></i> '. $legend->innertext .' <br/><h6>'. $extension->getDescription() .' <a class="urlextern" href="'. $extension->getURL() .'" target="_blank">Docs</a></h6>';
+                            }
+
+                        }
+
+                    } else {
+                        foreach ($elm->find('legend') as $legend) {
+                            $legend->innertext = '<i class="mdi mdi-puzzle text-success"></i> '. $legend->innertext;
+                        }
                     }
 
                 }

diff --git a/tpl/page-tools.php b/tpl/page-tools.php
@@ -23,8 +23,10 @@
 
                 $page_menu = $TEMPLATE->getToolMenu('page');
 
-                foreach ($page_menu['menu'] as $type => $item) {
-                    echo $item['html'];
+                if (isset($page_menu['menu'])) {
+                    foreach ($page_menu['menu'] as $type => $item) {
+                        echo $item['html'];
+                    }
                 }
 
             ?>