Index: branches/5.2.x/units/currencies/currencies_event_handler.php
===================================================================
diff -u -N -r16516 -r16601
--- branches/5.2.x/units/currencies/currencies_event_handler.php	(.../currencies_event_handler.php)	(revision 16516)
+++ branches/5.2.x/units/currencies/currencies_event_handler.php	(.../currencies_event_handler.php)	(revision 16601)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: currencies_event_handler.php 16516 2017-01-20 14:12:22Z alex $
+* @version	$Id: currencies_event_handler.php 16601 2018-04-06 12:07:55Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -241,12 +241,14 @@
 		$event->setEventParam('ids', $ids);
 		$ids = $event->getEventParam('ids');
 
-		$object = $event->getObject();
-		if(is_array($ids) && $ids[0])
-		{
-			$sql = 'SELECT ISO FROM '.$object->TableName.' WHERE CurrencyId IN ('.implode(',', $ids).')';
+		if ( $ids ) {
+			$table_name = $this->Application->getUnitOption($event->Prefix, 'TableName');
+			$sql = 'SELECT ISO FROM ' . $table_name . ' WHERE CurrencyId IN (' . implode(',', $ids) . ')';
 			$iso_list = $this->Conn->GetCol($sql);
 		}
+		else {
+			$iso_list = array();
+		}
 
 		$rate_source = $this->Application->ConfigValue('Comm_ExchangeRateSource');
 		$rate_source_classes = Array(	2 => 'FRNYCurrencyRates',
@@ -319,4 +321,4 @@
 
 		$this->Application->setUnitOption($event->Prefix, 'CalculatedFields', $calculated_fields);
 	}
-}
\ No newline at end of file
+}