summaryrefslogtreecommitdiffstats
path: root/frontends/php/include/forms.inc.php
diff options
context:
space:
mode:
authorosmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-06-14 14:40:47 +0000
committerosmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-06-14 14:40:47 +0000
commit0cc249e68ad687750781ab59a4e63808f56d9048 (patch)
tree1e50f2eabedae8c604662902cbef8a2fb726d248 /frontends/php/include/forms.inc.php
parent1efbabd9e03272f5ee71e048c4d4ef2a2e4880aa (diff)
downloadzabbix-0cc249e68ad687750781ab59a4e63808f56d9048.tar.gz
zabbix-0cc249e68ad687750781ab59a4e63808f56d9048.tar.xz
zabbix-0cc249e68ad687750781ab59a4e63808f56d9048.zip
- merged -r4298:4299 of branches/1.4.1/ (Eugene) [fixed 'Field [formula] is not double']
git-svn-id: svn://svn.zabbix.com/trunk@4301 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include/forms.inc.php')
-rw-r--r--frontends/php/include/forms.inc.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php
index 48e0a298..613219e6 100644
--- a/frontends/php/include/forms.inc.php
+++ b/frontends/php/include/forms.inc.php
@@ -1748,6 +1748,7 @@
$frmItem->AddVar("multiplier",$multiplier);
}
+ if( !is_numeric($formula)) $formula = 1;
if($multiplier == 1)
{
$frmItem->AddRow(S_CUSTOM_MULTIPLIER, new CTextBox("formula",$formula,40,$limited));