Index: branches/5.0.x/core/units/phrases/phrases_event_handler.php
===================================================================
diff -u -r12117 -r12298
--- branches/5.0.x/core/units/phrases/phrases_event_handler.php	(.../phrases_event_handler.php)	(revision 12117)
+++ branches/5.0.x/core/units/phrases/phrases_event_handler.php	(.../phrases_event_handler.php)	(revision 12298)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: phrases_event_handler.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: phrases_event_handler.php 12298 2009-08-16 21:11:28Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -36,23 +36,26 @@
 		function CheckPermission(&$event)
 		{
 			if (!$this->Application->IsAdmin() && $this->Application->isDebugMode() && constOn('DBG_PHRASES')) {
-				if ($event->Name == 'OnNew' || $event->Name == 'OnCreate' || $event->Name == 'OnPrepareUpdate' || $event->Name == 'OnUpdate') {
+				$allow_events = Array ('OnCreate', 'OnUpdate');
+
+				if (in_array($event->Name, $allow_events)) {
 					return true;
 				}
 			}
 
-
-
 			return parent::CheckPermission($event);
 		}
 
 		function mapPermissions()
 		{
 			parent::mapPermissions();
-				$permissions = Array (
-					'OnItemBuild' => Array('self' => true, 'subitem' => true),
-				);
 
+			$permissions = Array (
+				'OnItemBuild' => Array('self' => true, 'subitem' => true),
+				'OnNew' => Array('self' => true, 'subitem' => true),
+				'OnPrepareUpdate' => Array('self' => true, 'subitem' => true),
+			);
+
 			$this->permMapping = array_merge($this->permMapping, $permissions);
 		}
 
@@ -66,12 +69,12 @@
 			parent::OnNew($event);
 			$label = $this->Application->GetVar('phrases_label');
 
-			$object =& $event->getObject( $label ? Array('live_table'=>true, 'skip_autoload' => true) : Array('skip_autoload' => true) );
+			$object =& $event->getObject( $label ? Array('live_table' => true, 'skip_autoload' => true) : Array('skip_autoload' => true) );
 			if ($label) {
-				$object->SetDBField('Phrase',$label);
+				$object->SetDBField('Phrase', $label);
 				// phrase is created in language, used to display phrases
-				$object->SetDBField('LanguageId', $this->Application->Phrases->LanguageId);
-				$object->SetDBField('PhraseType',1);
+				$object->SetDBField('LanguageId', $this->Application->GetVar('m_lang'));
+				$object->SetDBField('PhraseType', 1);
 
 				$primary_language = $this->Application->GetDefaultLanguageId();
 				$live_table = $this->Application->getUnitOption($event->Prefix, 'TableName');
@@ -81,16 +84,22 @@
 			}
 
 			$last_module = $this->Application->GetVar('last_module');
-			if($last_module) $object->SetDBField('Module', $last_module);
+			if ($last_module) {
+				$object->SetDBField('Module', $last_module);
+			}
 
-			if($event->Special == 'export' || $event->Special == 'import')
-			{
+			if ($event->Special == 'export' || $event->Special == 'import') {
 				$object->SetDBField('PhraseType', '|0|1|2|');
 				$modules = $this->Conn->GetCol('SELECT Name FROM '.TABLE_PREFIX.'Modules');
 				$object->SetDBField('Module', '|'.implode('|', $modules).'|' );
 			}
 		}
 
+		/**
+		 * Prepares existing phrase editing
+		 *
+		 * @param kEvent $event
+		 */
 		function OnPrepareUpdate(&$event)
 		{
 			$language_id = $this->Application->GetVar('m_lang');
@@ -99,9 +108,12 @@
 			$table_name = $this->Application->getUnitOption($event->Prefix, 'TableName');
 			$label_idfield = $this->Application->getUnitOption($event->Prefix, 'IDField');
 
-			$sql = 'SELECT '.$label_idfield.' FROM '.$table_name.' WHERE Phrase = '.$this->Conn->qstr($label).' AND LanguageId = '.$language_id;
+			$sql = 'SELECT ' . $label_idfield . '
+					FROM ' . $table_name . '
+					WHERE Phrase = '.$this->Conn->qstr($label).' AND LanguageId = '.$language_id;
 			$this->Application->SetVar($event->getPrefixSpecial() . '_id', $this->Conn->GetOne($sql));
-//			$event->redirect = false;
+
+			$event->redirect = false;
 		}
 
 		/**