Index: branches/5.2.x/core/units/relationship/relationship_event_handler.php
===================================================================
diff -u -N -r13840 -r14095
--- branches/5.2.x/core/units/relationship/relationship_event_handler.php	(.../relationship_event_handler.php)	(revision 13840)
+++ branches/5.2.x/core/units/relationship/relationship_event_handler.php	(.../relationship_event_handler.php)	(revision 14095)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: relationship_event_handler.php 13086 2010-01-12 19:47:40Z alex $
+* @version	$Id: relationship_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
@@ -198,12 +198,13 @@
 			$vars = Array('#ITEM_NAMES#', '#ITEM_TYPES#');
 			$replacements = Array( implode(', ',$sql_parts['ItemName']), $sql_parts['TargetName'] );
 
-			$calculated_fields =& $object->getProperty('CalculatedFields');
+			$calculated_fields = $object->getCalculatedFields();
+
 			foreach ($calculated_fields as $field_name => $field_expression) {
 				$calculated_fields[$field_name] = str_replace($vars, $replacements, $field_expression);
 			}
 
-			$object->setProperty('CalculatedFields', $calculated_fields);
+			$object->setCalculatedFields($calculated_fields);
 
 			$sql = str_replace('#ITEM_JOIN#', implode(' ',$sql_parts['TableJoin']), $sql);
 			$sql = str_replace('rel.','%1$s.',$sql);