Index: branches/5.3.x/units/topics/topics_event_handler.php
===================================================================
diff -u -N -r15490 -r15694
--- branches/5.3.x/units/topics/topics_event_handler.php	(.../topics_event_handler.php)	(revision 15490)
+++ branches/5.3.x/units/topics/topics_event_handler.php	(.../topics_event_handler.php)	(revision 15694)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: topics_event_handler.php 15286 2012-04-11 08:48:42Z alex $
+* @version	$Id: topics_event_handler.php 15694 2013-02-19 11:30:18Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -217,15 +217,17 @@
 		{
 			parent::OnAfterConfigRead($event);
 
-			$fields = $this->Application->getUnitOption($event->Prefix, 'Fields');
+			$config = $event->getUnitConfig();
+
+			$fields = $config->getFields();
 			$fields['NotifyOwnerOnChanges']['default'] = (int)$this->Application->RecallPersistentVar('owner_notify');
-			$this->Application->setUnitOption($event->Prefix, 'Fields', $fields);
+			$config->setFields($fields);
 
-			$virtual_fields = $this->Application->getUnitOption($event->Prefix, 'VirtualFields');
+			$virtual_fields = $config->getVirtualFields();
 			$virtual_fields['DisableBBCodes']['default'] = (int)!$this->Application->RecallPersistentVar('bbcode');
 			$virtual_fields['DisableSmileys']['default'] = (int)!$this->Application->RecallPersistentVar('smileys');
 			$virtual_fields['ShowSignatures']['default'] = (int)$this->Application->RecallPersistentVar('show_sig');
-			$this->Application->setUnitOption($event->Prefix, 'VirtualFields', $virtual_fields);
+			$config->setVirtualFields($virtual_fields);
 		}
 
 		/**
@@ -240,17 +242,18 @@
 			parent::OnCloneSubItem($event);
 
 			if ( $event->MasterEvent->Prefix == 'rev' ) {
-				$clones = $this->Application->getUnitOption($event->MasterEvent->Prefix, 'Clones');
-				$subitem_prefix = $event->Prefix . '-' . $event->MasterEvent->Prefix;
+				$sub_item_prefix = $event->Prefix . '-' . $event->MasterEvent->Prefix;
 
-				$clones[$subitem_prefix]['ConfigMapping'] = Array (
-					'PerPage'				=>	'Perpage_TopicReviews',
+				$event->MasterEvent->getUnitConfig()->addClones(Array (
+					$sub_item_prefix => Array (
+						'ConfigMapping' => Array (
+							'PerPage'				=>	'Perpage_TopicReviews',
 
-					'ReviewDelayInterval'	=>	'topic_ReviewDelay_Interval',
-					'ReviewDelayValue'		=>	'topic_ReviewDelay_Value',
-				);
-
-				$this->Application->setUnitOption($event->MasterEvent->Prefix, 'Clones', $clones);
+							'ReviewDelayInterval'	=>	'topic_ReviewDelay_Interval',
+							'ReviewDelayValue'		=>	'topic_ReviewDelay_Value',
+						)
+					),
+				));
 			}
 		}