Index: branches/5.1.x/core/units/phrases/phrases_event_handler.php
===================================================================
diff -u -N -r14241 -r14338
--- branches/5.1.x/core/units/phrases/phrases_event_handler.php	(.../phrases_event_handler.php)	(revision 14241)
+++ branches/5.1.x/core/units/phrases/phrases_event_handler.php	(.../phrases_event_handler.php)	(revision 14338)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: phrases_event_handler.php 14241 2011-03-16 20:24:35Z alex $
+* @version	$Id: phrases_event_handler.php 14338 2011-05-23 07:39:43Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -48,7 +48,7 @@
 		 */
 		function CheckPermission(&$event)
 		{
-			if (!$this->Application->isAdmin && $this->Application->isDebugMode() && constOn('DBG_PHRASES')) {
+			if (!$this->Application->isAdmin && $this->Application->isDebugMode(false) && constOn('DBG_PHRASES')) {
 				$allow_events = Array ('OnCreate', 'OnUpdate');
 
 				if (in_array($event->Name, $allow_events)) {
@@ -171,6 +171,13 @@
 				if ($this->Application->GetVar('m_lang') != $this->Application->GetVar('lang_id')) {
 					$object->SwitchToLive();
 				}
+
+				$next_template = $this->Application->GetVar('next_template');
+
+				if ($next_template) {
+					$event->redirect = $next_template;
+					$event->SetRedirectParam('opener', 's');
+				}
 			}
 
 			parent::OnCreate($event);
Index: branches/5.1.x/core/kernel/languages/phrases_cache.php
===================================================================
diff -u -N -r14241 -r14338
--- branches/5.1.x/core/kernel/languages/phrases_cache.php	(.../phrases_cache.php)	(revision 14241)
+++ branches/5.1.x/core/kernel/languages/phrases_cache.php	(.../phrases_cache.php)	(revision 14338)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: phrases_cache.php 14241 2011-03-16 20:24:35Z alex $
+* @version	$Id: phrases_cache.php 14338 2011-05-23 07:39:43Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -127,6 +127,7 @@
 					'm_opener' => 'd',
 					'phrases_label' => '#LABEL#',
 					'phrases_event' => 'OnPreparePhrase',
+					'next_template' => urlencode('external:' . $_SERVER['REQUEST_URI']),
 					'pass' => 'm,phrases'
 				);