From 5fba72dbfda07d04597ac9e0d9e91b89779fa612 Mon Sep 17 00:00:00 2001 From: tokul Date: Sat, 30 Sep 2006 07:09:09 +0000 Subject: [PATCH] don't leave old code and DO check filters plugin when reporter informs about the way to reproduce issue. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11780 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- functions/plugin.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/functions/plugin.php b/functions/plugin.php index 98f7565c..342d2ac4 100644 --- a/functions/plugin.php +++ b/functions/plugin.php @@ -142,7 +142,6 @@ function do_hook_function($name,$parm=NULL) { function concat_hook_function($name,$parm=NULL) { global $squirrelmail_plugin_hooks, $currentHookName; $ret = ''; -// $ret = array(); $currentHookName = $name; if (isset($squirrelmail_plugin_hooks[$name]) @@ -150,8 +149,10 @@ function concat_hook_function($name,$parm=NULL) { foreach ($squirrelmail_plugin_hooks[$name] as $function) { /* Add something to set correct gettext domain for plugin. */ if (function_exists($function)) { -// $ret .= $function($parm); - $ret = sqm_array_merge($ret, $function($parm)); + $plugin_ret = $function($parm); + if (!empty($plugin_ret)) { + $ret = sqm_array_merge($ret, $plugin_ret); + } } } } -- 2.25.1