Index: branches/5.3.x/core/kernel/db/db_event_handler.php
===================================================================
diff -u -N -r15483 -r15677
--- branches/5.3.x/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 15483)
+++ branches/5.3.x/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 15677)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: db_event_handler.php 15474 2012-07-24 10:34:36Z alex $
+* @version	$Id: db_event_handler.php 15677 2013-01-17 18:52:50Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -1844,6 +1844,12 @@
 			$event->SetRedirectParam('m_lang', $this->Application->GetDefaultLanguageId());
 			$event->SetRedirectParam($event->getPrefixSpecial() . '_id', array_shift($ids));
 			$event->SetRedirectParam('pass', 'all,' . $event->getPrefixSpecial());
+
+			$simultaneous_edit_message = $this->Application->GetVar('_simultanious_edit_message');
+
+			if ( $simultaneous_edit_message ) {
+				$event->SetRedirectParam('_simultanious_edit_message', urlencode($simultaneous_edit_message));
+			}
 		}
 
 		/**
@@ -2250,7 +2256,7 @@
 			$ids = $this->StoreSelectedIDs($event);
 
 			if ( $ids ) {
-				$status_field = array_shift( $this->Application->getUnitOption($event->Prefix, 'StatusField') );
+				$status_field = $object->getStatusField();
 				$order_field = $this->Application->getUnitOption($event->Prefix, 'OrderField');
 
 				if ( !$order_field ) {
@@ -2495,19 +2501,19 @@
 		 */
 		protected function _deleteSubscriptions($prefix, $field, $value)
 		{
-			$sql = 'SELECT EventId
-					FROM ' . TABLE_PREFIX . 'EmailEvents
+			$sql = 'SELECT TemplateId
+					FROM ' . $this->Application->getUnitOption('email-template', 'TableName') . '
 					WHERE BindToSystemEvent REGEXP "' . $this->Conn->escape($prefix) . '(\\\\.[^:]*:.*|:.*)"';
-			$email_event_ids = $this->Conn->GetCol($sql);
+			$email_template_ids = $this->Conn->GetCol($sql);
 
-			if ( !$email_event_ids ) {
+			if ( !$email_template_ids ) {
 				return;
 			}
 
 			// e-mail events, connected to that unit prefix are found
 			$sql = 'SELECT SubscriptionId
 					FROM ' . TABLE_PREFIX . 'SystemEventSubscriptions
-					WHERE ' . $field . ' = ' . $value . ' AND EmailEventId IN (' . implode(',', $email_event_ids) . ')';
+					WHERE ' . $field . ' = ' . $value . ' AND EmailTemplateId IN (' . implode(',', $email_template_ids) . ')';
 			$ids = $this->Conn->GetCol($sql);
 
 			if ( !$ids ) {
@@ -2899,8 +2905,7 @@
 			$items_info = $this->Application->GetVar('u');
 
 			if ( $items_info ) {
-				$user_id = array_shift(array_keys($items_info));
-
+				list ($user_id, ) = each($items_info);
 				$this->RemoveRequiredFields($object);
 
 				$is_new = !$object->isLoaded();
@@ -3190,6 +3195,10 @@
 			echo preg_replace('/^' . preg_quote($id, '/') . '_/', '', $fname);
 
 			$this->deleteTempFiles($tmp_path);
+
+			if ( file_exists($tmp_path . 'resized/') ) {
+				$this->deleteTempFiles($tmp_path . 'resized/');
+			}
 		}
 
 		/**
@@ -3473,7 +3482,7 @@
 			echo '<suggestions>';
 
 			foreach ($data as $item) {
-				echo '<item>' . htmlspecialchars($item) . '</item>';
+				echo '<item>' . htmlspecialchars($item, null, CHARSET) . '</item>';
 			}
 
 			echo '</suggestions>';