Create a proxy event (gallery_event) which is called when the request

is completing.

2 files changed, 12 insertions, 14 deletions

diff --git a/core/helpers/module.php b/core/helpers/module.php
index 49f0fdea..0d43c248 100644
--- a/core/helpers/module.php
+++ b/core/helpers/module.php
@@ -165,27 +165,13 @@ class module_Core {
     }
 
     try {
-      $hooks = array();
       foreach ($modules as $module) {
         self::$module_names[$module->name] = $module->name;
         self::$modules[$module->name] = $module;
         $kohana_modules[] = MODPATH . $module->name;
-        $module_path = MODPATH . $module->name;
-        $kohana_modules[] = $module_path;
-        if (file_exists("$module_path/hooks") &&
-            ($hook_files = glob("$module_path/hooks/*.php")) !== false) {
-            $hooks = array_merge($hooks, $hook_files);
-        }
       }
 
       Kohana::config_set("core.modules", $kohana_modules);
-      /*
-       * Kohana loads the hooks before all the installed module paths are defined, so lets call
-       * any module hooks now
-       */
-      foreach($hooks as $hook) {
-        include($hook);
-      }
     } catch (Exception $e) {
       self::$module_names = array();
       self::$modules = array();
@@ -213,6 +199,17 @@ class module_Core {
   }
 
   /**
+   * Kohana shutdown event handler
+   * @param string $module_name
+   * @param string $name
+   * @param string $default_value
+   * @return the value
+   */
+  static function shutdown() {
+    self::event("gallery_shutdown");
+  }
+
+  /**
    * Get a variable from this module
    * @param string $module_name
    * @param string $name
diff --git a/core/hooks/init_gallery.php b/core/hooks/init_gallery.php
index 89f97ef9..014c29ea 100644
--- a/core/hooks/init_gallery.php
+++ b/core/hooks/init_gallery.php
@@ -21,6 +21,7 @@ Event::add("system.ready", array("I18n", "instance"));
 Event::add("system.post_routing", array("theme", "load_themes"));
 Event::add("system.ready", array("module", "load_modules"));
 Event::add("system.post_routing", array("url", "parse_url"));
+Event::add("system.shutdown", array("module", "shutdown"));
 
 // Override the cookie if we have a session id in the URL.
 // @todo This should probably be an event callback