Index: branches/5.2.x/core/units/phrases/phrases_event_handler.php
===================================================================
diff -u -N -r14585 -r14596
--- branches/5.2.x/core/units/phrases/phrases_event_handler.php	(.../phrases_event_handler.php)	(revision 14585)
+++ branches/5.2.x/core/units/phrases/phrases_event_handler.php	(.../phrases_event_handler.php)	(revision 14596)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: phrases_event_handler.php 14585 2011-09-24 12:04:17Z alex $
+* @version	$Id: phrases_event_handler.php 14596 2011-09-29 15:46:43Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -17,36 +17,35 @@
 	class PhrasesEventHandler extends kDBEventHandler
 	{
 		/**
-		 * Apply some special processing to
-		 * object beeing recalled before using
-		 * it in other events that call prepareObject
+		 * Apply some special processing to object being
+		 * recalled before using it in other events that
+		 * call prepareObject
 		 *
-		 * @param Object $object
+		 * @param kDBItem|kDBList $object
 		 * @param kEvent $event
+		 * @return void
 		 * @access protected
 		 */
-		function prepareObject(&$object, &$event)
+		protected function prepareObject(&$object, &$event)
 		{
 			// don't call parent
 			if ($event->Special == 'import' || $event->Special == 'export') {
 				$this->RemoveRequiredFields($object);
-				$object->setRequired('LangFile');
-				$object->setRequired('PhraseType');
-				$object->setRequired('Module');
+				$object->setRequired( Array ('LangFile', 'PhraseType', 'Module') );
 
 				// allow multiple phrase types to be selected during import/export
-				$field_options = $object->GetFieldOptions('PhraseType');
-				$field_options['type'] = 'string';
-				$object->SetFieldOptions('PhraseType', $field_options);
+				$object->SetFieldOption('PhraseType', 'type', 'string');
 			}
 		}
 
 		/**
 		 * Allow to create phrases from front end in debug mode with DBG_PHRASES constant set
 		 *
 		 * @param kEvent $event
+		 * @return bool
+		 * @access public
 		 */
-		function CheckPermission(&$event)
+		public function CheckPermission(&$event)
 		{
 			if (!$this->Application->isAdmin && $this->Application->isDebugMode(false) && kUtil::constOn('DBG_PHRASES')) {
 				$allow_events = Array ('OnCreate', 'OnUpdate');
@@ -217,8 +216,10 @@
 		 * Set last change info, when phrase is created
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeItemCreate(&$event)
+		protected function OnBeforeItemCreate(&$event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -227,15 +228,15 @@
 
 			$primary_language_id = $this->Application->GetDefaultLanguageId();
 
-			if (!$object->GetDBField('l' . $primary_language_id . '_Translation')) {
+			if ( !$object->GetDBField('l' . $primary_language_id . '_Translation') ) {
 				// no translation on primary language -> try to copy from other language
 				$src_languages = Array ('lang_id', 'm_lang'); // editable language, theme language
 
 				foreach ($src_languages as $src_language) {
 					$src_language = $this->Application->GetVar($src_language);
 					$src_value = $src_language ? $object->GetDBField('l' . $src_language . '_Translation') : false;
 
-					if ($src_value) {
+					if ( $src_value ) {
 						$object->SetDBField('l' . $primary_language_id . '_Translation', $src_value);
 						break;
 					}
@@ -249,8 +250,10 @@
 		 * Update last change info, when phrase is updated
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeItemUpdate(&$event)
+		protected function OnBeforeItemUpdate(&$event)
 		{
 			parent::OnBeforeItemUpdate($event);