From 187fc607b6bd649b8d5937e05d78df7061681954 Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Wed, 29 Dec 2010 12:45:56 +0000 Subject: [PATCH] Hook files inclusion moved to session.inc --- CHANGELOG.txt | 5 +++++ includes/hooks.inc | 8 -------- includes/session.inc | 9 +++++++++ 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index babeba9a..21c70269 100644 --- 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 d89c1d3e..669a5ce8 100644 --- 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 2424b574..261f8914 100644 --- 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 -- 2.30.2