Merge pull request #1381 from colemanw/ccJs

[civicrm-core.git] / api / v3 / MailingEventSubscribe.php

diff --git a/api/v3/MailingEventSubscribe.php b/api/v3/MailingEventSubscribe.php
index 9ec4744c39dca52434c1a6d409f564d8e2aa69de..d109dd64b321660b2e55c7c307864de9e01afea6 100644 (file)
--- a/api/v3/MailingEventSubscribe.php
+++ b/api/v3/MailingEventSubscribe.php
@@ -56,7 +56,7 @@ function civicrm_api3_mailing_event_subscribe_create($params) {
   $group->is_active = 1;
   $group->id        = (int)$group_id;
   if (!$group->find(TRUE)) {
-    return civicrm_api3_create_error('Invalid Group id');
+    throw new API_Exception('Invalid Group id');
   }
 
   $subscribe = CRM_Mailing_Event_BAO_Subscribe::subscribe($group_id, $email, $contact_id);
@@ -68,10 +68,9 @@ function civicrm_api3_mailing_event_subscribe_create($params) {
     $subscribe->send_confirm_request($email);
 
     $values = array();
-    $values['contact_id'] = $subscribe->contact_id;
-    $values['subscribe_id'] = $subscribe->id;
-    $values['hash'] = $subscribe->hash;
-    $values['is_error'] = 0;
+    $values[$subscribe->id]['contact_id'] = $subscribe->contact_id;
+    $values[$subscribe->id]['subscribe_id'] = $subscribe->id;
+    $values[$subscribe->id]['hash'] = $subscribe->hash;
 
     return civicrm_api3_create_success($values);
   }