- added upgrades/dbpatches/1.0beta4_to_1.0beta5/ with patches (Alexei)

 - added support for disktotal[*] (Alexei)
 - added support for inodetotal[*] (Alexei)
 - added support for *,/,+, and - in trigger expressions (Alexei)
 - removed frontends/php/chart4.php (Alexei)
 - update item status to UNSUPPORTED in case if SNMP support was not included
 into zabbix_suckerd (Alexei)
 - added mysql_init() to DBconnect() (Alexei)
 - fixed Next100 and Prev100 for case if some hosts are hidden (Alexei)
 - added select for latest values (Alexei)
 - delete related services if trigger is deleted (Alexei)
 - fixed problem with substitution of macros for messages (Alexei)
 - eliminated DBis_empty() by replacing to DBnum_rows() (Alexei)
 - MAX_STRING_LEN increased to 4096 (Alexei)
 - fixed zabbix_log(). Possible coredump if data contains %s, etc (Alexei)


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

1 files changed, 4 insertions, 0 deletions

diff --git a/frontends/php/services.php b/frontends/php/services.php
index ca4a9f48..89fabaea 100644
--- a/frontends/php/services.php
+++ b/frontends/php/services.php
@@ -309,6 +309,10 @@
         {
                 $servicedownid_=DBget_field($result,$i,0);
                 $name_=DBget_field($result,$i,2);
+		if( strstr($name_,"%s"))
+		{
+			$name_=expand_trigger_description(DBget_field($result,$i,1));
+		}
 		echo "<OPTION VALUE='$servicedownid_'>$name_";
         }
         echo "</SELECT>";