Index: trunk/core/admin_templates/regional/phrases_edit.tpl
===================================================================
diff -u -N -r8397 -r8446
--- trunk/core/admin_templates/regional/phrases_edit.tpl	(.../phrases_edit.tpl)	(revision 8397)
+++ trunk/core/admin_templates/regional/phrases_edit.tpl	(.../phrases_edit.tpl)	(revision 8446)
@@ -17,7 +17,7 @@
 						}
 					) );
 				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-						cancel_edit('phrases','OnCancelEdit','<inp2:phrases_SaveEvent/>','<inp2:m_Phrase label="la_FormCancelConfirmation" escape="1"/>');
+						submit_event('phrases','OnCancel');
 						}
 				 ) );
 
@@ -30,7 +30,7 @@
 					<inp2:m_if check="phrases_IsSingle" inverse="inverse">
 						a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 					</inp2:m_if>
-					
+
 					a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
 								go_to_id('phrases', '<inp2:phrases_PrevId/>');
 							}
@@ -42,7 +42,7 @@
 				</inp2:m_if>
 
 				a_toolbar.Render();
-				
+
 				<inp2:m_RenderElement name="edit_navigation" prefix="phrases"/>
 			</script>
 		</td>
Index: trunk/core/units/general/cat_event_handler.php
===================================================================
diff -u -N -r8432 -r8446
--- trunk/core/units/general/cat_event_handler.php	(.../cat_event_handler.php)	(revision 8432)
+++ trunk/core/units/general/cat_event_handler.php	(.../cat_event_handler.php)	(revision 8446)
@@ -1845,6 +1845,7 @@
 		$use_pending = $this->Application->getUnitOption($event->Prefix, 'UsePendingEditing');
 		if ($this->Application->IsAdmin() || !$use_pending) {
 			parent::OnUpdate($event);
+			$this->SetFrontRedirectTemplate($event, 'modify');
 			return ;
 		}
 
Index: trunk/core/units/general/helpers/permissions_helper.php
===================================================================
diff -u -N -r8417 -r8446
--- trunk/core/units/general/helpers/permissions_helper.php	(.../permissions_helper.php)	(revision 8417)
+++ trunk/core/units/general/helpers/permissions_helper.php	(.../permissions_helper.php)	(revision 8446)
@@ -158,13 +158,16 @@
 			$event_handler =& $this->Application->recallObject($event->Prefix.'_EventHandler');
 			/* @var $event_handler kCatDBEventHandler */
 
+			$raise_warnings = $event->getEventParam('raise_warnings');
+			$event->setEventParam('raise_warnings', 0);
 			if ($event->Prefix != $top_prefix) {
 				$top_event = new kEvent($top_prefix.':'.$event->Name);
 				$id = $event_handler->getPassedID($top_event);
 			}
 			else {
 				$id = $event_handler->getPassedID($event);
 			}
+			$event->setEventParam('raise_warnings', $raise_warnings);
 
 			$owner_id = -1; // owner is root if not detected
 			if (!$id) {