Fix for ticket #366

1) Stored the menu element type in the menu element
2) Scanned the menu before display removing any empty sub menus.
Went with the removal approach because there will more users than developers

Signed-off-by:  <unostar@danalan.info>

1 files changed, 14 insertions, 0 deletions

diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index 31c2faa7..904a3c07 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -103,11 +103,25 @@ class Theme_View_Core extends View {
           call_user_func_array(array($class, "site"), array(&$menu, $this));
         }
       }
+
+      $this->_remove_empty_items($menu);
     }
 
     print $menu;
   }
 
+  private function _remove_empty_items($menu) {
+    foreach ($menu->elements as $target_id => $element) {
+      if ($element->type == "submenu") {
+        if (empty($element->elements)) {
+          $menu->remove($target_id);
+        } else {
+          $this->_remove_empty_items($element);
+        }
+      }
+    }
+  }
+
   public function album_menu() {
     $this->_menu("album");
   }