Should be a better fix so this hook now works with plugins that have been using it...

[squirrelmail.git] / functions / plugin.php

diff --git a/functions/plugin.php b/functions/plugin.php
index 2bc6bff060551e711419a499b3b9cbf3f9723900..98f7565c86d5b39aafd21514cdb3fcab8ec1e0f7 100644 (file)
--- a/functions/plugin.php
+++ b/functions/plugin.php
@@ -141,8 +141,8 @@ function do_hook_function($name,$parm=NULL) {
  */
 function concat_hook_function($name,$parm=NULL) {
     global $squirrelmail_plugin_hooks, $currentHookName;
  */
 function concat_hook_function($name,$parm=NULL) {
     global $squirrelmail_plugin_hooks, $currentHookName;

-//    $ret = '';
-    $ret = array();
+    $ret = '';
+//    $ret = array();

     $currentHookName = $name;
 
     if (isset($squirrelmail_plugin_hooks[$name])
     $currentHookName = $name;
 
     if (isset($squirrelmail_plugin_hooks[$name])


@@ -160,10 +160,6 @@ function concat_hook_function($name,$parm=NULL) {
 
     /* Variable-length argument lists have a slight problem when */
     /* passing values by reference. Pity. This is a workaround.  */
 
     /* Variable-length argument lists have a slight problem when */
     /* passing values by reference. Pity. This is a workaround.  */

-    // FIXME: empty return array breaks legacy use of this hook, so 
-    // as a workaround, return empty string (let's fix the 
-    // hook calls so we can pull this out)
-    if (empty($ret)) return '';

     return $ret;
 }
 
     return $ret;
 }