Index: branches/5.2.x/core/units/mailing_lists/mailing_list_eh.php
===================================================================
diff -u -N -r13840 -r14095
--- branches/5.2.x/core/units/mailing_lists/mailing_list_eh.php	(.../mailing_list_eh.php)	(revision 13840)
+++ branches/5.2.x/core/units/mailing_lists/mailing_list_eh.php	(.../mailing_list_eh.php)	(revision 14095)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: mailing_list_eh.php 13086 2010-01-12 19:47:40Z alex $
+* @version	$Id: mailing_list_eh.php 14095 2010-12-28 17:37:07Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -73,7 +73,7 @@
 
 					$sql = 'SELECT ' . $id_field . '
 							FROM ' . $table_name . '
-							WHERE ' . $id_field . ' IN (' . implode(',', $ids) . ') AND Status <> ' . MAILING_LIST_PARTIALLY_PROCESSED;
+							WHERE ' . $id_field . ' IN (' . implode(',', $ids) . ') AND Status <> ' . MailingList::PARTIALLY_PROCESSED;
 					$allowed_ids = $this->Conn->GetCol($sql);
 
 					$event->setEventParam('ids', $allowed_ids);
@@ -123,7 +123,7 @@
 			if ($ids) {
 				foreach ($ids as $id) {
 					$object->Load($id);
-					$object->SetDBField('Status', MAILING_LIST_CANCELLED);
+					$object->SetDBField('Status', MailingList::CANCELLED);
 					$object->Update();
 				}
 			}
@@ -174,7 +174,7 @@
 			/* @var $object kDBItem */
 
 			$status = $object->GetDBField('Status');
-			if (($status != $object->GetOriginalField('Status')) && ($status == MAILING_LIST_CANCELLED)) {
+			if (($status != $object->GetOriginalField('Status')) && ($status == MailingList::CANCELLED)) {
 				$this->_deleteQueue($event);
 			}
 		}
@@ -227,7 +227,7 @@
 			$table_name = $this->Application->getUnitOption($event->Prefix, 'TableName');
 
 			$where_clause = Array (
-				'Status NOT IN (' . MAILING_LIST_CANCELLED . ',' . MAILING_LIST_PROCESSED . ')',
+				'Status NOT IN (' . MailingList::CANCELLED . ',' . MailingList::PROCESSED . ')',
 				'(EmailsQueued < EmailsTotal) OR (EmailsTotal = 0)',
 				'`To` <> ""',
 			);
@@ -254,8 +254,8 @@
 				if ($mailing_data['EmailsTotal'] == 0) {
 					// no work performed on this mailing list -> calculate totals
 					$updated_fields = $mailing_list_helper->generateRecipients($mailing_id, $mailing_data);
-					$updated_fields['Status'] = MAILING_LIST_PARTIALLY_PROCESSED;
-					$mailing_data = array_merge_recursive2($mailing_data, $updated_fields);
+					$updated_fields['Status'] = MailingList::PARTIALLY_PROCESSED;
+					$mailing_data = array_merge($mailing_data, $updated_fields);
 
 					$this->Conn->doUpdate($updated_fields, $table_name, $id_field . ' = ' . $mailing_id);
 				}
@@ -281,7 +281,7 @@
 					'ToParsed' => serialize($emails),
 					'EmailsQueued' => $mailing_data['EmailsQueued'] + $process_count,
 				);
-				$mailing_data = array_merge_recursive2($mailing_data, $updated_fields);
+				$mailing_data = array_merge($mailing_data, $updated_fields);
 				$this->Conn->doUpdate($updated_fields, $table_name, $id_field . ' = ' . $mailing_id);
 
 				if (!$to_queue) {