Solved recursion problem and increased efficiency of template_construct hook by addin...

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

diff --git a/class/template/template.class.php b/class/template/template.class.php
index 43547114193fae488c99213d6e9a41df36751e02..f1c37c4ff30de5951dcaddc71699c465be5c68b0 100755 (executable)
--- a/class/template/template.class.php
+++ b/class/template/template.class.php
@@ -390,8 +390,8 @@ return substr($this->template_dir, strlen(SM_PATH));
         } else {
 
             $aPluginOutput = array();
-            $aPluginOutput = do_hook_function('template_construct', 
-                                              array($aPluginOutput, $file, $this));
+            $aPluginOutput = concat_hook_function('template_construct_' . $file,
+                                                  array($aPluginOutput, $this));
             $this->assign('plugin_output', $aPluginOutput);
 
             // pull in our config file ($t?  let's try to be more verbose please :-) )
@@ -440,8 +440,8 @@ return substr($this->template_dir, strlen(SM_PATH));
         } else {
 
             $aPluginOutput = array();
-            $aPluginOutput = do_hook_function('template_construct', 
-                                              array($aPluginOutput, $file, $this));
+            $aPluginOutput = concat_hook_function('template_construct_' . $file,
+                                                  array($aPluginOutput, $this));
             $this->assign('plugin_output', $aPluginOutput);
 
             // pull in our config file ($t?  let's try to be more verbose please :-) )