diff options
| author | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-07-27 09:18:02 +0000 |
|---|---|---|
| committer | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-07-27 09:18:02 +0000 |
| commit | c4e0b6dd5ace927945b0310fd02ba09e3ddab378 (patch) | |
| tree | 313eca901457b66abe73899c328a04e5e4837f76 /frontends/php/graphs.php | |
| parent | 8ed7e67b6e765ccde12611e14649bb93419843b2 (diff) | |
| download | zabbix-c4e0b6dd5ace927945b0310fd02ba09e3ddab378.tar.gz zabbix-c4e0b6dd5ace927945b0310fd02ba09e3ddab378.tar.xz zabbix-c4e0b6dd5ace927945b0310fd02ba09e3ddab378.zip | |
- merged rev. 4468:4469 of brunches/1.4.2 (Eugene) [improved inheritance of template graphs]
git-svn-id: svn://svn.zabbix.com/trunk@4470 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/graphs.php')
| -rw-r--r-- | frontends/php/graphs.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/frontends/php/graphs.php b/frontends/php/graphs.php index 0cf15e2f..55c42f7e 100644 --- a/frontends/php/graphs.php +++ b/frontends/php/graphs.php @@ -373,7 +373,7 @@ include_once "include/page_header.php"; " AND i.hostid not in (".$denyed_hosts.") ". " AND ".DBid2nodeid("g.graphid")."=".$ZBX_CURNODEID. " AND i.hostid is not NULL ". - " ORDER BY g.name"); + " ORDER BY g.name, g.graphid"); } else { @@ -381,7 +381,7 @@ include_once "include/page_header.php"; " left join items i on gi.itemid=i.itemid ". " WHERE ".DBid2nodeid("g.graphid")."=".$ZBX_CURNODEID. " AND ( i.hostid not in (".$denyed_hosts.") OR i.hostid is NULL )". - " ORDER BY g.name"); + " ORDER BY g.name, g.graphid"); } while($row=DBfetch($result)) { |