From a5e27c0c89d5a3e89e48cbbc73efb0731799f1cc Mon Sep 17 00:00:00 2001 From: sasha Date: Tue, 6 Nov 2007 12:18:33 +0000 Subject: - [NTT-44] The last character for last value is unreadable (Sasha) [svn merge -r4972:4975 svn://svn.zabbix.com/branches/1.4.j] git-svn-id: svn://svn.zabbix.com/trunk@4976 97f52cf1-0a1b-0410-bd0e-c28be96e8082 --- frontends/php/include/items.inc.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'frontends/php/include/items.inc.php') diff --git a/frontends/php/include/items.inc.php b/frontends/php/include/items.inc.php index 49b7dd16..fc07cca6 100644 --- a/frontends/php/include/items.inc.php +++ b/frontends/php/include/items.inc.php @@ -1091,19 +1091,19 @@ COpt::profiling_stop('prepare table'); { if($db_item["value_type"] == ITEM_VALUE_TYPE_LOG) { - $row=DBfetch(DBselect("select max(id) as max from history_log where itemid=".$db_item["itemid"])); - - if($row && !is_null($row['max'])) + $row=DBfetch(DBselect("select value from history_log where itemid=".$db_item["itemid"]." order by id desc", 1)); + if($row) { - $row2=DBfetch(DBselect("select value from history_log where id=".$row["max"])); - $lastvalue=nbsp(htmlspecialchars(substr($row2["value"],0,20))); - if(strlen($db_item["lastvalue"]) > 20) - $lastvalue .= " ..."; + $lastvalue=/*nbsp(htmlspecialchars(*/$row["value"]/*))*/; + if(utf8_strlen($lastvalue) > 20) + $lastvalue = utf8_strtop($lastvalue,20)." ..."; + $lastvalue = nbsp(htmlspecialchars($lastvalue)); } else { $lastvalue="-"; } + } else if(isset($db_item["lastvalue"])) { -- cgit