Return a string when no submenu is present

Soflomo · Apr 29, 2013 · 3baaf27 · 3baaf27
1 parent 2d2396a
commit 3baaf27
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/src/Common/View/Helper/SubMenu.php b/src/Common/View/Helper/SubMenu.php
@@ -109,15 +109,16 @@ public function __toString()
         // Reset the container
         $menu->setContainer($current);
 
-        if (strlen($html)) {
-            $label = $this->header ?: $container->getLabel();
-
-            return sprintf('<ul%s><li%s><a href="%s">%s</a>%s</li></ul>',
-                    (null !== $this->class) ? ' class="' . $this->class . '"' : null,
-                    ($container->isActive())? ' class="active"' : null,
-                    $container->getHref(),
-                    $label,
-                    $html);
+        if (!strlen($html)) {
+            return '';
         }
+
+        $label = $this->header ?: $container->getLabel();
+        return sprintf('<ul%s><li%s><a href="%s">%s</a>%s</li></ul>',
+                (null !== $this->class) ? ' class="' . $this->class . '"' : null,
+                ($container->isActive())? ' class="active"' : null,
+                $container->getHref(),
+                $label,
+                $html);
     }
 }