From: Tomas K. <to...@us...> - 2006-09-30 07:09:12
|
Update of /cvsroot/squirrelmail/squirrelmail/functions In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv26536 Modified Files: plugin.php Log Message: don't leave old code and DO check filters plugin when reporter informs about the way to reproduce issue. Index: plugin.php =================================================================== RCS file: /cvsroot/squirrelmail/squirrelmail/functions/plugin.php,v retrieving revision 1.59 retrieving revision 1.60 diff -u -w -r1.59 -r1.60 --- plugin.php 29 Sep 2006 18:20:56 -0000 1.59 +++ plugin.php 30 Sep 2006 07:09:09 -0000 1.60 @@ -142,7 +142,6 @@ 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 @@ 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); + } } } } |