hook must be moved because include/constants.php is

loaded before plugins are initialized.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11661 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/include/constants.php b/include/constants.php
index e6e20486be22a08c1437ceaacb53333f589b0dd8..9745b8b0c16079cc51cade74e4168199435950ab 100644 (file)
--- a/include/constants.php
+++ b/include/constants.php
@@ -150,9 +150,3 @@ define('SQM_COL_INT_DATE', 8);
 define('SQM_COL_TO', 9);
 define('SQM_COL_CC', 10);
 define('SQM_COL_BCC', 11);
-
-/**
- * FIXME: error notice on direct load
- * @since 1.2.0
- */
-do_hook('loading_constants');

diff --git a/include/init.php b/include/init.php
index 6c3e957ecb294089cda81894c6f0774eaadeab28..5d715105ae8b82a48d4d14f48e1208ad8d75056f 100644 (file)
--- a/include/init.php
+++ b/include/init.php
@@ -284,6 +284,13 @@ if (isset($plugins) && is_array($plugins)) {
     }
 }
 
+/**
+ * Before 1.5.2 version hook was part of functions/constants.php.
+ * After init layout changes, hook had to be moved because include/constants.php is
+ * loaded before plugins are initialized.
+ * @since 1.2.0
+ */
+do_hook('loading_constants');
 
 switch ($sInitLocation) {
     case 'style': session_write_close(); sqsetcookieflush(); break;