diff options
author | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-07-05 09:22:34 +0000 |
---|---|---|
committer | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-07-05 09:22:34 +0000 |
commit | 0f93047219d365318ef9feb7005403b1c3155bfa (patch) | |
tree | fa08172aad7936d7ab9834f8252432e5f5e59d94 /frontends/php/popup.php | |
parent | 51edf7af1a0eee6ddfe22e62d846abeb8c43bcc3 (diff) | |
download | zabbix-0f93047219d365318ef9feb7005403b1c3155bfa.tar.gz zabbix-0f93047219d365318ef9feb7005403b1c3155bfa.tar.xz zabbix-0f93047219d365318ef9feb7005403b1c3155bfa.zip |
- added frontend-side support of quotes and triger expression validation (Eugene)
- merged rev. 4305:4307 [improved trigger expression syntax and validation]
- merged rev. 4329:4331 [more support for quotes in key parameters]
- merged rev. 4344:4346 [minor improovments]
- merged rev. 4431:4432 [added availability of using ":," character for key]
git-svn-id: svn://svn.zabbix.com/trunk@4437 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/popup.php')
-rw-r--r-- | frontends/php/popup.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/frontends/php/popup.php b/frontends/php/popup.php index 58d0834c..46c8f746 100644 --- a/frontends/php/popup.php +++ b/frontends/php/popup.php @@ -740,7 +740,7 @@ function add_item_variable(s_formname,x_value) if(isset($hostid)) $sql .= " and h.hostid=$hostid"; - $sql .= " order by h.host"; + $sql .= " order by h.host, i.description, i.key_, i.itemid"; $result = DBselect($sql); while($row = DBfetch($result)) |