summaryrefslogtreecommitdiffstats
path: root/frontends/php/include
diff options
context:
space:
mode:
authorosmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2006-04-12 12:38:14 +0000
committerosmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2006-04-12 12:38:14 +0000
commit4a63d35d87dd4e72db91d32f258f9100ae529ce6 (patch)
tree9d52d04b059e03f36106cffa98fdc3fdd90e5810 /frontends/php/include
parentd3e734908313dab2a71ba1ef53b0d28316d3163b (diff)
downloadzabbix-4a63d35d87dd4e72db91d32f258f9100ae529ce6.tar.gz
zabbix-4a63d35d87dd4e72db91d32f258f9100ae529ce6.tar.xz
zabbix-4a63d35d87dd4e72db91d32f258f9100ae529ce6.zip
- map link update bugfix (Eugene)
git-svn-id: svn://svn.zabbix.com/trunk@2732 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include')
-rw-r--r--frontends/php/include/forms.inc.php2
-rw-r--r--frontends/php/include/maps.inc.php2
2 files changed, 4 insertions, 0 deletions
diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php
index f6f732ed..331f79b9 100644
--- a/frontends/php/include/forms.inc.php
+++ b/frontends/php/include/forms.inc.php
@@ -2438,6 +2438,8 @@
$drawtype_on = $db_link["drawtype_on"];
$color_off = $db_link["color_off"];
$color_on = $db_link["color_on"];
+
+ if(is_null($triggerid)) $triggerid = 0;
}
else
{
diff --git a/frontends/php/include/maps.inc.php b/frontends/php/include/maps.inc.php
index 1480af02..c2197b9d 100644
--- a/frontends/php/include/maps.inc.php
+++ b/frontends/php/include/maps.inc.php
@@ -108,6 +108,8 @@
function update_link($linkid,$sysmapid,$selementid1,$selementid2,$triggerid,$drawtype_off,$color_off,$drawtype_on,$color_on)
{
+ if($triggerid == 0) $triggerid = 'NULL';
+
return DBexecute("update sysmaps_links set ".
"sysmapid=$sysmapid,selementid1=$selementid1,selementid2=$selementid2,".
"triggerid=$triggerid,drawtype_off=$drawtype_off,color_off=".zbx_dbstr($color_off).",".