[5.2] mod_menu php fixes (joomla#44318)

Author: chmst

administrator/modules/mod_menu/src/Menu/CssMenu.php

@@ -132,7 +132,7 @@ public function load($params, $enabled)
 
                 // In recovery mode, load the preset inside a special root node.
                 $this->root = new AdministratorMenuItem(['level' => 0]);
-                $heading    = new AdministratorMenuItem(['title' => 'MOD_MENU_RECOVERY_MENU_ROOT', 'type' => 'heading']);
+                $heading    = new AdministratorMenuItem(['title' => 'MOD_MENU_RECOVERY_MENU_ROOT', 'type' => 'heading', 'class' => 'class:fa fa-notes-medical']);
                 $this->root->addChild($heading);
 
                 MenusHelper::loadPreset('default', true, $heading);
@@ -293,7 +293,7 @@ protected function preprocess($parent)
                 continue;
             }
 
-            if (substr($item->link, 0, 8) === 'special:') {
+            if (!empty($item->link) && substr($item->link, 0, 8) === 'special:') {
                 $special = substr($item->link, 8);
 
                 if ($special === 'language-forum') {
@@ -311,12 +311,10 @@ protected function preprocess($parent)
              * processing. It is needed for links from menu items of third party extensions link to Joomla! core
              * components like com_categories, com_fields...
              */
-            if ($option = $uri->getVar('option')) {
-                $item->element = $option;
-            }
+            $item->element = !empty($uri->getVar('option')) ? $uri->getVar('option') : '';
 
             // Exclude item if is not enabled
-            if ($item->element && !ComponentHelper::isEnabled($item->element)) {
+            if ($item->element !== '' && !ComponentHelper::isEnabled($item->element)) {
                 $parent->removeChild($item);
                 continue;
             }
@@ -413,7 +411,7 @@ protected function preprocess($parent)
             }
 
             // Exclude if link is invalid
-            if (\is_null($item->link) || !\in_array($item->type, ['separator', 'heading', 'container']) && trim($item->link) === '') {
+            if (!isset($item->link) || !\in_array($item->type, ['separator', 'heading', 'container']) && trim($item->link) === '') {
                 $parent->removeChild($item);
                 continue;
             }
@@ -460,7 +458,7 @@ protected function preprocess($parent)
             }
 
             // Ok we passed everything, load language at last only
-            if ($item->element) {
+            if (!empty($item->element)) {
                 $language->load($item->element . '.sys', JPATH_ADMINISTRATOR) ||
                 $language->load($item->element . '.sys', JPATH_ADMINISTRATOR . '/components/' . $item->element);
             }
@@ -492,7 +490,7 @@ protected function preprocess($parent)
      */
     public function getIconClass($node)
     {
-        $identifier = $node->class;
+        $identifier = !empty($node->class) ? $node->class : '';
 
         // Top level is special
         if (trim($identifier) == '') {
@@ -518,7 +516,7 @@ public function getIconClass($node)
     }
 
     /**
-     * Create unique identifier
+     * Increase the counter and return the new value
      *
      * @return  string
      *

libraries/src/Menu/AdministratorMenuItem.php

@@ -43,4 +43,20 @@ class AdministratorMenuItem extends MenuItem
      * @since  4.0.0
      */
     public $iconImage;
+
+    /**
+     * The class of the menu item
+     *
+     * @var string
+     * @since __DEPLOY_VERSION__
+     */
+    public $class = '';
+
+    /**
+     * The element type of the menu item
+     *
+     * @var string
+     * @since __DEPLOY_VERSION__
+     */
+    public $element = '';
 }

libraries/src/Menu/MenuItem.php

@@ -81,7 +81,7 @@ class MenuItem implements NodeInterface
      * @var    string
      * @since  3.7.0
      */
-    public $link;
+    public $link = '';
 
     /**
      * The type of link