ported r3264 (log messages ordering) from 1.1.2

git-svn-id: svn://svn.zabbix.com/trunk@3268 97f52cf1-0a1b-0410-bd0e-c28be96e8082

2 files changed, 3 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 55eb4247..195b823e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 Changes for 1.3:
 
+ - fixed order of displaying log files (Eugene)
+ - added support of 'pfree' and 'pused' for 'vfs.fs.size' of windows (Eugene)
  - added '<=' comporator for trigger severity of action conditions (Eugene)
  - fixed problem with escape characters in triggers (Eugene)
  - fixed 'system.cpu.util[*]' for Tru64 (Eugene)
diff --git a/frontends/php/history.php b/frontends/php/history.php
index 2c66c028..e6cb8eac 100644
--- a/frontends/php/history.php
+++ b/frontends/php/history.php
@@ -333,7 +333,7 @@
 			$sql = "select hst.host,i.itemid,i.key_,i.description,h.clock,h.value,i.valuemapid,h.timestamp,h.source,h.severity".
 				" from history_log h, items i, hosts hst".
 				" where hst.hostid=i.hostid and h.itemid=i.itemid".$sql_filter." and i.itemid in (".$itemid_lst.")".$cond_clock.
-				" order by clock desc";
+				" order by h.clock desc, h.id desc";
 
 			$result=DBselect($sql,$limit);