From 4480476589e8a4cb578b1e6744c413bb5ba39400 Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Fri, 5 Jul 2013 10:15:41 +0000 Subject: [PATCH] 2013-07-05 Sergio Martin * lib/PandoraFMS/PluginServer.pm: Fixed subst_alert_macros assignation to variable. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8482 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_server/ChangeLog | 5 +++++ pandora_server/lib/PandoraFMS/PluginServer.pm | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index 4585757151..70099dd556 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,8 @@ +2013-07-05 Sergio Martin + + * lib/PandoraFMS/PluginServer.pm: Fixed subst_alert_macros assignation + to variable. + 2013-07-05 Ramon Novoa * lib/PandoraFMS/Core.pm: Exported subst_alert_macros. Added support diff --git a/pandora_server/lib/PandoraFMS/PluginServer.pm b/pandora_server/lib/PandoraFMS/PluginServer.pm index ab7dc8f2b6..2ffdc9686a 100644 --- a/pandora_server/lib/PandoraFMS/PluginServer.pm +++ b/pandora_server/lib/PandoraFMS/PluginServer.pm @@ -200,7 +200,7 @@ sub data_consumer ($$) { _plugin_parameters_ => (defined ($module)) ? $module->{'plugin_parameter'} : '', _email_tag_ => (defined ($module)) ? pandora_get_module_url_tags ($pa_config, $dbh, $module->{'id_agente_modulo'}) : '', ); - subst_alert_macros ($parameters, \%macros); + $parameters = subst_alert_macros ($parameters, \%macros); # If something went wrong with macros, we log it if ($@) {