From bbac5629dae2716fcdf0a8d75d69334671cf2f72 Mon Sep 17 00:00:00 2001 From: pdontthink Date: Fri, 29 Sep 2006 18:20:56 +0000 Subject: [PATCH] Should be a better fix so this hook now works with plugins that have been using it the old way too git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11768 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- functions/plugin.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/functions/plugin.php b/functions/plugin.php index 2bc6bff0..98f7565c 100644 --- 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; -// $ret = ''; - $ret = array(); + $ret = ''; +// $ret = array(); $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. */ - // 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; } -- 2.25.1