Hook files inclusion moved to session.inc

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index babeba9a01bd749ffc605d3e7ab15bbb80a2d906..21c70269cfa8e8581cd6de18bd19edd15c79fccf 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,11 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+29-Dec-2010 Janusz Dobrowolski
+! Hook files inclusion moved to session.inc
+$ /includes/hooks.inc
+  /includes/session.inc
+
 27-Dec-2010 Joe Hunt
 ! Prepared for category icons in applications/application.php for themes
   To activate, set $show_menu_category_icons = 1, in config.php

diff --git a/includes/hooks.inc b/includes/hooks.inc
index d89c1d3e677c3e30fe7b8f5ad8beffa497ef81a8..669a5ce8e2bec0d737ba354d075b32f411bbd50e 100644 (file)
--- a/includes/hooks.inc
+++ b/includes/hooks.inc
@@ -164,14 +164,6 @@ class hooks {
                return true;
        }
 }
-//
-// include all extensions hook files.
-//
-foreach ($installed_extensions as $ext)
-{
-       if (file_exists($path_to_root.'/'.$ext['path'].'/hooks.php'))
-               include_once($path_to_root.'/'.$ext['path'].'/hooks.php');
-}
 
 /*
        Installs hooks provided by extension modules

diff --git a/includes/session.inc b/includes/session.inc
index 2424b57421a2af8036767644be1a1396fd2a3a3f..261f8914684262a22c3d842646dcd032c369770e 100644 (file)
--- a/includes/session.inc
+++ b/includes/session.inc
@@ -182,6 +182,15 @@ include_once($path_to_root . "/includes/ui/ui_msgs.inc");
 include_once($path_to_root . "/includes/prefs/sysprefs.inc");
 
 include_once($path_to_root . "/includes/hooks.inc");
+//
+// include all extensions hook files.
+//
+foreach ($installed_extensions as $ext)
+{
+       if (file_exists($path_to_root.'/'.$ext['path'].'/hooks.php'))
+               include_once($path_to_root.'/'.$ext['path'].'/hooks.php');
+}
+
 
 /*
        Uncomment the setting below when using FA on shared hosting