Fix for unknown index notices caused in templates when looking for plugin output...

[squirrelmail.git] / class / template / Template.class.php

diff --git a/class/template/Template.class.php b/class/template/Template.class.php
index 7b3fa0b1c73798eb5673e7913c184ac213c39169..c43e04aeb886b94aa06f63bf0037a5f009485bfb 100644 (file)
--- a/class/template/Template.class.php
+++ b/class/template/Template.class.php
@@ -311,10 +311,15 @@ class Template
       * Allow template set to override plugin configuration by either
       * adding or removing plugins.
       *
+      * NOTE: due to when this code executes, plugins activated here
+      *       do not have access to the config_override and loading_prefs 
+      *       hooks; instead, such plugins can use the 
+      *       "template_plugins_override_after" hook defined below.
+      *
       */
     function override_plugins() {
 
-        global $disable_plugins, $plugins, $squirrelmail_plugin_hooks;
+        global $disable_plugins, $plugins, $squirrelmail_plugin_hooks, $null;
         if ($disable_plugins) return;
 
         $add_plugins = Template::get_template_config($this->template_set_id,
@@ -371,6 +376,8 @@ class Template
             }
         }
 
+        do_hook('template_plugins_override_after', $null);
+
     }
 
     /**
@@ -1403,14 +1410,9 @@ FIXME: We could make the incoming array more complex so it can
         } else {
 
             $aPluginOutput = array();
-            // At this moment concat_hook_function can return string and arrays.
-            // In php 4.3.x a notice will be raised when a string is passed as $aPluginOutput
-            // TODO, only return an arrays by concat_hook_function.
-            $mixedOutput = concat_hook_function('template_construct_' . $file,
-                                                  $temp=array(&$aPluginOutput, &$this));
-            if (is_array($mixedOutput)) {
-                $aPluginOutput = $mixedOutput;
-            }
+            $aPluginOutput = concat_hook_function('template_construct_' . $file,
+                                                  $temp=array(&$aPluginOutput, &$this),
+                                                  TRUE);
             $this->assign('plugin_output', $aPluginOutput);
 
             //$output = $this->apply_template($template);