* finish task #5236.

2019-01-25 10:03:51 +08:00
parent 69413ff785
commit 03d3c82301
1 changed files with 4 additions and 5 deletions
@@ -615,11 +615,10 @@ class commonModel extends model
                        $subMenu .= "<li class='$subActive' data-id='$subMenuItem->name'>" . html::a($subLink, $subLabel) . '</li>';
                    }

-                    if($subMenu)
-                    {
-                        $label   .= "<span class='caret'></span>";
-                        $subMenu  = "<ul class='dropdown-menu'>{$subMenu}</ul>";
-                    }
+                    if(empty($subMenu)) continue;
+
+                    $label   .= "<span class='caret'></span>";
+                    $subMenu  = "<ul class='dropdown-menu'>{$subMenu}</ul>";
                }

                $menuItemHtml = "<li class='$class $active' data-id='$menuItem->name'>" . html::a($link, $label, $target) . $subMenu . "</li>\n";