Avoid displaying notices when a subpanel definition key cannot be found

triplesprawl · Oct 26, 2020 · 168b59c · 168b59c
1 parent 8a00696
commit 168b59c
Showing 1 changed file with 23 additions and 2 deletions.
diff --git a/include/SubPanel/SubPanelDefinitions.php b/include/SubPanel/SubPanelDefinitions.php
@@ -705,11 +705,32 @@ public function get_available_tabs($FromGetModuleSubpanels = false)
      */
     public function load_subpanel($name, $reload = false, $original_only = false, $search_query = '', $collections = array())
     {
-        if (!is_dir('modules/' . $this->layout_defs [ 'subpanel_setup' ][ strtolower($name) ] [ 'module' ])) {
+        $panelName = strtolower($name);
+
+        if (!array_key_exists($panelName, $this->layout_defs ['subpanel_setup'])) {
+            LoggerManager::getLogger()->error(
+                sprintf(
+                    "Trying to load subpanel without definition: %s in module %s",
+                    $panelName,
+                    $this->_focus->module_dir
+                )
+            );
+            return false;
+        }
+
+        if (!is_dir('modules/' . $this->layout_defs ['subpanel_setup'][$panelName] ['module'])) {
             return false;
         }
 
-        $subpanel = new aSubPanel($name, $this->layout_defs [ 'subpanel_setup' ] [ strtolower($name) ], $this->_focus, $reload, $original_only, $search_query, $collections) ;
+        $subpanel = new aSubPanel(
+            $name,
+            $this->layout_defs ['subpanel_setup'] [$panelName],
+            $this->_focus,
+            $reload,
+            $original_only,
+            $search_query,
+            $collections
+        );
 
         // only return the subpanel object if we can display it.
         if ($subpanel->canDisplay == true) {