- merged rev. 4501:4502 of branches/1.4.2 (Eugene)

[ - added undefined element message 'No **** defined' instead 'Premission deny' (Eugene)
- fixed items,graphs,hostgroups deletion (Eugene)
- fixed permisions for maps (Eugene) ]

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

1 files changed, 6 insertions, 0 deletions

diff --git a/frontends/php/include/items.inc.php b/frontends/php/include/items.inc.php
index 3232d384..d2a45d30 100644
--- a/frontends/php/include/items.inc.php
+++ b/frontends/php/include/items.inc.php
@@ -756,6 +756,12 @@
 		$result = delete_history_by_itemid($itemid, 1 /* use housekeeper */);
 		if(!$result)	return	$result;
 
+		DBexecute('delete from screens_items where resourceid='.$itemid.' and resourcetype in ('.
+					(implode(',',array(
+						SCREEN_RESOURCE_SIMPLE_GRAPH,
+						SCREEN_RESOURCE_PLAIN_TEXT)
+						)
+					).')');
 
 		$result = DBexecute("delete from items_applications where itemid=$itemid");
 		if(!$result)	return	$result;