Index: branches/5.2.x/core/units/selectors/selectors_event_handler.php
===================================================================
diff -u -N -r13840 -r14095
--- branches/5.2.x/core/units/selectors/selectors_event_handler.php	(.../selectors_event_handler.php)	(revision 13840)
+++ branches/5.2.x/core/units/selectors/selectors_event_handler.php	(.../selectors_event_handler.php)	(revision 14095)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: selectors_event_handler.php 13750 2010-06-09 20:01:41Z alex $
+* @version	$Id: selectors_event_handler.php 14095 2010-12-28 17:37:07Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -14,8 +14,8 @@
 
 defined('FULL_PATH') or die('restricted access!');
 
-safeDefine('STYLE_BASE', 	1);
-safeDefine('STYLE_BLOCK', 	2);
+kUtil::safeDefine('STYLE_BASE', 	1);
+kUtil::safeDefine('STYLE_BLOCK', 	2);
 
 	class SelectorsEventHandler extends kDBEventHandler
 	{
@@ -244,7 +244,7 @@
 
 			$selector_data = $this->RemoveParentProperties($event, $selector_data);
 
-			if( !IsSerialized($selector_data) ) $selector_data = serialize($selector_data);
+			if( !kUtil::IsSerialized($selector_data) ) $selector_data = serialize($selector_data);
 
 			$object->SetDBField('SelectorData', $selector_data);
 		}
@@ -259,7 +259,7 @@
 			$object =& $event->getObject();
 			$selector_data = $object->GetDBField('SelectorData');
 			if(!$selector_data) $selector_data = Array();
-			if( IsSerialized($selector_data) ) $selector_data = unserialize($selector_data);
+			if( kUtil::IsSerialized($selector_data) ) $selector_data = unserialize($selector_data);
 
 			$selector_data = $this->AddParentProperties($event, $selector_data);
 
@@ -278,7 +278,9 @@
 			$parent_info = $object->getLinkedInfo();
 			$title_field = $this->Application->getUnitOption($event->Prefix,'TitleField');
 			$sql = 'SELECT '.$title_field.', '.$object->IDField.' FROM '.$object->TableName.' WHERE Type = 1 AND StylesheetId = '.$parent_info['ParentId'].' ORDER BY '.$title_field;
-			$object->Fields['ParentId']['options'] = $this->Conn->GetCol($sql,$object->IDField);
+
+			$options = $this->Conn->GetCol($sql,$object->IDField);
+			$object->SetFieldOption('ParentId', 'options', $options);
 		}
 
 		/**
@@ -295,7 +297,7 @@
 				$sql = 'SELECT SelectorData FROM '.$object->TableName.' WHERE '.$object->IDField.' = '.$parent_id;
 				$base_selector_data = $this->Conn->GetOne($sql);
 
-				if( IsSerialized($base_selector_data) ) $base_selector_data = unserialize($base_selector_data);
+				if( kUtil::IsSerialized($base_selector_data) ) $base_selector_data = unserialize($base_selector_data);
 
 				foreach($selector_data as $prop_name => $prop_value)
 				{
@@ -332,9 +334,9 @@
 				$sql = 'SELECT SelectorData FROM '.$object->TableName.' WHERE '.$object->IDField.' = '.$parent_id;
 				$base_selector_data = $this->Conn->GetOne($sql);
 
-				if( IsSerialized($base_selector_data) ) $base_selector_data = unserialize($base_selector_data);
+				if( kUtil::IsSerialized($base_selector_data) ) $base_selector_data = unserialize($base_selector_data);
 
-				$selector_data = array_merge_recursive2($base_selector_data,$selector_data);
+				$selector_data = kUtil::array_merge_recursive($base_selector_data,$selector_data);
 
 				$object->SetDBField('SelectorData', $selector_data);
 				return $selector_data;
@@ -353,7 +355,7 @@
 			$object->SetFieldsFromHash( $this->getSubmittedFields($event) );
 			$object->ResetStyle();
 
-			$event->redirect_params['pass'] = 'all,'.$event->getPrefixSpecial();
+			$event->SetRedirectParam('pass', 'all,'.$event->getPrefixSpecial());
 		}
 
 		/**