* 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"...)

1 files changed, 19 insertions, 0 deletions

diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php
index a3088c38..ae8bcc11 100644
--- a/modules/gallery/helpers/module.php
+++ b/modules/gallery/helpers/module.php
@@ -283,9 +283,28 @@ class module_Core {
     array_shift($args);
     $function = str_replace(".", "_", $name);
 
+    if (method_exists("gallery_event", $function)) {
+      switch (count($args)) {
+      case 0:
+        gallery_event::$function();
+        break;
+      case 1:
+        gallery_event::$function($args[0]);
+        break;
+      case 2:
+        gallery_event::$function($args[0], $args[1]);
+        break;
+      default:
+        call_user_func_array(array("gallery_event", $function), $args);
+      }
+    }
+
     // @todo: consider calling gallery_event first, since for things menus we need it to do some
     // setup
     foreach (self::$active as $module) {
+      if ($module->name == "gallery") {
+        continue;
+      }
       $class = "{$module->name}_event";
       if (method_exists($class, $function)) {
         call_user_func_array(array($class, $function), $args);