From 89a67dba63f8ac61b90e4c4f1ba1b0cdbdf20b26 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 29 Sep 2009 08:50:53 -0700
Subject: * Remove the @todo in module event and always try to call
 gallery_event::$function first * Refactor gallery.php to move site_menu,
 admin_menu, and context_menu to gallery_event.php * Change Theme_View and
 Admin_view to call module::event("site_menu|admin_menu|context_menu"...)

---
 modules/gallery/libraries/Admin_View.php | 1 -
 modules/gallery/libraries/Theme_View.php | 2 --
 2 files changed, 3 deletions(-)

(limited to 'modules/gallery/libraries')

diff --git a/modules/gallery/libraries/Admin_View.php b/modules/gallery/libraries/Admin_View.php
index fd4fbea8..9b12df7e 100644
--- a/modules/gallery/libraries/Admin_View.php
+++ b/modules/gallery/libraries/Admin_View.php
@@ -46,7 +46,6 @@ class Admin_View_Core extends Gallery_View {
 
   public function admin_menu() {
     $menu = Menu::factory("root");
-    gallery::admin_menu($menu, $this);
     module::event("admin_menu", $menu, $this);
     $menu->compact();
     return $menu;
diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index ebd6a920..728e8bf9 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -80,7 +80,6 @@ class Theme_View_Core extends Gallery_View {
 
   public function site_menu() {
     $menu = Menu::factory("root");
-    gallery::site_menu($menu, $this);
     module::event("site_menu", $menu, $this);
     return $menu->compact();
   }
@@ -124,7 +123,6 @@ class Theme_View_Core extends Gallery_View {
                ->label(t("Options")))
       ->css_class("gContextMenu");
 
-    gallery::context_menu($menu, $this, $item, $thumbnail_css_selector);
     module::event("context_menu", $menu, $this, $item, $thumbnail_css_selector);
     return $menu->compact();
   }
-- 
cgit v1.2.3