- merged rev. 4508:4509 of branches/1.4.2 (Eugene) [- improved item and trigger filtering]

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

1 files changed, 4 insertions, 4 deletions

diff --git a/frontends/php/items.php b/frontends/php/items.php
index 030c38a7..f03db801 100644
--- a/frontends/php/items.php
+++ b/frontends/php/items.php
@@ -576,10 +576,6 @@ include_once "include/page_header.php";
 				$where_case[] = 'ia.applicationid=a.applicationid';
 				$where_case[] = 'a.name like '.zbx_dbstr('%'.$_REQUEST['with_application'].'%');
 			}
-			if(isset($_REQUEST['with_description']))
-			{
-				$where_case[] = 'i.description like '.zbx_dbstr('%'.$_REQUEST['with_description'].'%');
-			}
 			if(isset($_REQUEST['with_type']) && $_REQUEST['with_type'] != -1)
 			{
 				$where_case[] = 'i.type='.$_REQUEST['with_type'];
@@ -761,6 +757,10 @@ include_once "include/page_header.php";
 		{
 			$description = array();
 
+			$item_description = item_description($db_item["description"],$db_item["key_"]);
+
+			if( $_REQUEST['external_filter'] && isset($_REQUEST['with_description']) && !stristr($item_description, $_REQUEST['with_description']) ) continue;
+
 			if($db_item["templateid"])
 			{
 				$template_host = get_realhost_by_itemid($db_item["templateid"]);