Index: branches/5.0.x/core/install/upgrades.php
===================================================================
diff -u -r12430 -r12466
--- branches/5.0.x/core/install/upgrades.php	(.../upgrades.php)	(revision 12430)
+++ branches/5.0.x/core/install/upgrades.php	(.../upgrades.php)	(revision 12466)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: upgrades.php 12430 2009-09-03 16:51:54Z dmitrya $
+* @version	$Id: upgrades.php 12466 2009-09-08 15:14:28Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -1157,28 +1157,42 @@
 		function Upgrade_5_0_1($mode)
 		{
 			if ($mode == 'after') {
-
 				// delete old events
-				$events_to_delete = Array ( 'CATEGORY.MODIFY', 'CATEGORY.DELETE' );
+				$events_to_delete = Array ('CATEGORY.MODIFY', 'CATEGORY.DELETE');
 
-				$sql = 'SELECT EventId FROM ' . TABLE_PREFIX . 'Events
-							WHERE Event IN ("' . implode('","', $events_to_delete) . '")';
+				$sql = 'SELECT EventId
+						FROM ' . TABLE_PREFIX . 'Events
+						WHERE Event IN ("' . implode('","', $events_to_delete) . '")';
 				$event_ids = $this->Conn->GetCol($sql);
 
 				if ($event_ids) {
-					$sql = 'DELETE FROM ' . TABLE_PREFIX . 'EmailMessage
-								WHERE EventId IN (' . implode(',', $event_ids) . ')';
-					$this->Conn->Query($sql);
+					$this->_deleteEvents($event_ids);
 
-					$sql = 'DELETE FROM ' . TABLE_PREFIX . 'Events
-								WHERE EventId IN (' . implode(',', $event_ids) . ')';
-					$this->Conn->Query($sql);
-
 					$sql = 'DELETE FROM ' . TABLE_PREFIX . 'Phrase
-								WHERE Phrase IN ("la_event_category.modify", "la_event_category.delete")';
+							WHERE Phrase IN ("la_event_category.modify", "la_event_category.delete")';
 					$this->Conn->Query($sql);
 				}
+
+				// partially delete events
+				$sql = 'SELECT EventId
+						FROM ' . TABLE_PREFIX . 'Events
+						WHERE (Event IN ("CATEGORY.APPROVE", "CATEGORY.DENY")) AND (Type = ' . EVENT_TYPE_ADMIN . ')';
+				$event_ids = $this->Conn->GetCol($sql);
+
+				if ($event_ids) {
+					$this->_deleteEvents($event_ids);
+				}
 			}
 		}
 
+		function _deleteEvents($ids)
+		{
+			$sql = 'DELETE FROM ' . TABLE_PREFIX . 'EmailMessage
+					WHERE EventId IN (' . implode(',', $ids) . ')';
+			$this->Conn->Query($sql);
+
+			$sql = 'DELETE FROM ' . TABLE_PREFIX . 'Events
+					WHERE EventId IN (' . implode(',', $ids) . ')';
+			$this->Conn->Query($sql);
+		}
 	}
\ No newline at end of file