- fixed discovery event showing (Eugene)

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

1 files changed, 2 insertions, 2 deletions

diff --git a/frontends/php/include/events.inc.php b/frontends/php/include/events.inc.php
index d5fc0592..792860b7 100644
--- a/frontends/php/include/events.inc.php
+++ b/frontends/php/include/events.inc.php
@@ -107,7 +107,7 @@
 		if(is_null($nodeid)) $nodeid = $ZBX_CURNODEID;
 			
 		$db_events = DBselect('select distinct e.source,e.object,e.objectid,e.clock,e.value from events e'.
-			' where '.' e.source='.EVENT_SOURCE_DISCOVERY.' order by e.clock desc',
+			' where e.source='.EVENT_SOURCE_DISCOVERY.' order by e.clock desc',
 			10*($start+$num)
 			);
        
@@ -148,7 +148,7 @@
 					break;
 				case EVENT_OBJECT_DSERVICE:
 					$object_data = DBfetch(DBselect('select h.ip,s.type,s.port from dhosts h,dservices s '.
-						' where h.dhostid=s.dhostid, s.dserviceid='.$event_data['objectid']));
+						' where h.dhostid=s.dhostid and s.dserviceid='.$event_data['objectid']));
 					$description = S_SERVICE.': '.discovery_check_type2str($object_data['type']).'; '.
 						S_PORT.': '.$object_data['port'];
 					break;