Index: branches/5.3.x/core/units/helpers/mailing_list_helper.php
===================================================================
diff -u -N -r15578 -r15698
--- branches/5.3.x/core/units/helpers/mailing_list_helper.php	(.../mailing_list_helper.php)	(revision 15578)
+++ branches/5.3.x/core/units/helpers/mailing_list_helper.php	(.../mailing_list_helper.php)	(revision 15698)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: mailing_list_helper.php 15578 2012-10-16 13:55:05Z alex $
+* @version	$Id: mailing_list_helper.php 15698 2013-02-19 11:33:17Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -225,8 +225,9 @@
 				return $recipient_ids;
 			}
 
-			$id_field = $this->Application->getUnitOption($recipient_type, 'IDField');
-			$table_name = $this->Application->getUnitOption($recipient_type, 'TableName');
+			$config = $this->Application->getUnitConfig($recipient_type);
+			$id_field = $config->getIDField();
+			$table_name = $config->getTableName();
 
 			$sql = 'SELECT ' . $title_field . '
 					FROM ' . $table_name . '
@@ -246,14 +247,14 @@
 				unset($mailing_totals[0]);
 			}
 
-			$id_field = $this->Application->getUnitOption('mailing-list', 'IDField');
-			$table_name = $this->Application->getUnitOption('mailing-list', 'TableName');
+			$config = $this->Application->getUnitConfig('mailing-list');
+			$table_name = $config->getTableName();
 
 			// update sent email count for each processed mailing
 			foreach ($mailing_totals as $mailing_id => $mailing_total) {
 				$sql = 'UPDATE ' . $table_name . '
 						SET EmailsSent = EmailsSent + ' . $mailing_total . '
-						WHERE ' . $id_field . ' = ' . $mailing_id;
+						WHERE ' . $config->getIDField() . ' = ' . $mailing_id;
 				$this->Conn->Query($sql);
 			}
 
@@ -274,7 +275,7 @@
 			$esender = $this->Application->recallObject('EmailSender');
 			/* @var $esender kEmailSendingHelper */
 
-			$queue_table = $this->Application->getUnitOption('email-queue', 'TableName');
+			$queue_table = $this->Application->getUnitConfig('email-queue')->getTableName();
 
 			$i = 0;
 			$message = Array ();