From a44b72ec254cc374e3513c5e636091156ab05c71 Mon Sep 17 00:00:00 2001 From: hkosaka Date: Wed, 27 Aug 2014 02:36:02 +0000 Subject: [PATCH] 2014-08-27 Hirofumi Kosaka * lib/PandoraFMS/PluginServer.pm: Fixed that _plugin_param2_ and _plugin_param2_desc_ (and so on) were not replaced with the corresponding values. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10460 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_server/ChangeLog | 6 ++++++ pandora_server/lib/PandoraFMS/PluginServer.pm | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index 699469629d..b807fb8c95 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,9 @@ +2014-08-27 Hirofumi Kosaka + + * lib/PandoraFMS/PluginServer.pm: Fixed that _plugin_param2_ + and _plugin_param2_desc_ (and so on) were not replaced with + the corresponding values. + 2014-08-25 Vanessa Gil * util/pandora_db.pl: Fixed problem diff --git a/pandora_server/lib/PandoraFMS/PluginServer.pm b/pandora_server/lib/PandoraFMS/PluginServer.pm index 4d6ea9a753..b4f596b230 100644 --- a/pandora_server/lib/PandoraFMS/PluginServer.pm +++ b/pandora_server/lib/PandoraFMS/PluginServer.pm @@ -193,7 +193,7 @@ sub data_consumer ($$) { # build 'plugin module' dependent alert macros my $field_number = $macro_field; - $field_number = s/.*([0-9]+).*/$1/; + $field_number =~ s/.*([0-9]+).*/$1/; my $name_for_desc = "_plugin_param${field_number}_desc_"; my $name_for_value = "_plugin_param${field_number}_";