diff options
| author | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-06-16 10:42:29 +0000 |
|---|---|---|
| committer | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-06-16 10:42:29 +0000 |
| commit | 400140ceb21e1f141ebfd62afa145cbc4ee2901d (patch) | |
| tree | 28b3a1dd8f334272dc25dcbe7aa3912915d817ae /frontends/php/include/triggers.inc.php | |
| parent | 5603bd407a6fc337ca523ac7f372588f3c645162 (diff) | |
| download | zabbix-400140ceb21e1f141ebfd62afa145cbc4ee2901d.tar.gz zabbix-400140ceb21e1f141ebfd62afa145cbc4ee2901d.tar.xz zabbix-400140ceb21e1f141ebfd62afa145cbc4ee2901d.zip | |
- [DEV-181] temp expression on triggers copy changed from {???:???} to 0 (Artem)
- [DEV-137] improvements in user operation result determination in hosts,triggers,items screens (Artem)
git-svn-id: svn://svn.zabbix.com/trunk@5769 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include/triggers.inc.php')
| -rw-r--r-- | frontends/php/include/triggers.inc.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/frontends/php/include/triggers.inc.php b/frontends/php/include/triggers.inc.php index 88d2d07d..3936f408 100644 --- a/frontends/php/include/triggers.inc.php +++ b/frontends/php/include/triggers.inc.php @@ -808,9 +808,9 @@ * Comments: !!! Don't forget sync code with C !!! * * * ******************************************************************************/ - function replace_template_dependencies($deps, $hostid){ + function replace_template_dependencies($deps, $hostid){ foreach($deps as $id => $val){ - if($db_new_dep = DBfetch(DBselect('SEELCT t.triggerid '. + if($db_new_dep = DBfetch(DBselect('SELECT t.triggerid '. ' FROM triggers t,functions f,items i '. ' WHERE t.templateid='.$val. ' AND f.triggerid=t.triggerid '. @@ -871,7 +871,7 @@ ' (triggerid,description,type,priority,status,comments,url,value,expression,templateid)'. ' VALUES ('.$newtriggerid.','.zbx_dbstr($trigger['description']).','.$trigger['type'].','.$trigger['priority'].','. $trigger["status"].','.zbx_dbstr($trigger["comments"]).','. - zbx_dbstr($trigger["url"]).",2,'{???:???}',".($copy_mode ? 0 : $triggerid).')'); + zbx_dbstr($trigger["url"]).",2,'0',".($copy_mode ? 0 : $triggerid).')'); if(!$result) return $result; |