From 3bebf483a2e1ea34e233b7414dc9b0ac777cc14d Mon Sep 17 00:00:00 2001
From: Aaron Schachter <aaronschachter@gmail.com>
Date: Wed, 5 Mar 2014 09:48:56 -0500
Subject: [PATCH 1/3] Adds set_signup_message function

---
 .../dosomething_signup/dosomething_signup.module | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/lib/modules/dosomething/dosomething_signup/dosomething_signup.module b/lib/modules/dosomething/dosomething_signup/dosomething_signup.module
index a3acf4b14..862fa7a3d 100644
--- a/lib/modules/dosomething/dosomething_signup/dosomething_signup.module
+++ b/lib/modules/dosomething/dosomething_signup/dosomething_signup.module
@@ -299,12 +299,22 @@ function dosomething_signup_user_signup($nid, $account = NULL) {
     );
     dosomething_user_send_message_request('campaign_signup', $params);
     // Set success message.
-    $message = t("You're signed up!") . '<br />';
-    $message .= t("Get started with") . ' ' . $node->title . '  ' . t("below!");
-    drupal_set_message($message);
+    dosomething_signup_set_signup_message($node->title);
   }
 }
 
+/**
+ * Sets Drupal message for a signup for given $title.
+ *
+ * @param string $title
+ *   Title to display within the Drupal message.
+ */
+function dosomething_signup_set_signup_message($title) {
+  $message = t("You're signed up for") . ' <em>' . $title . '</em>! ';
+  $message .=  t("Get started below.");
+  drupal_set_message($message);
+}
+
 /**
  * Returns array of nid's that a user has signed up for.
  *

From 81180355bddeec5fa6180b39da1290cf7ab0d0e1 Mon Sep 17 00:00:00 2001
From: Aaron Schachter <aaronschachter@gmail.com>
Date: Wed, 5 Mar 2014 09:51:34 -0500
Subject: [PATCH 2/3] Fixes #991

---
 .../dosomething_user/dosomething_user.module          | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/modules/dosomething/dosomething_user/dosomething_user.module b/lib/modules/dosomething/dosomething_user/dosomething_user.module
index 0ef38ef3c..372eacc84 100644
--- a/lib/modules/dosomething/dosomething_user/dosomething_user.module
+++ b/lib/modules/dosomething/dosomething_user/dosomething_user.module
@@ -408,6 +408,8 @@ function dosomething_user_clean_cell_number($number) {
  *    - impact_noun
  */
 function dosomething_user_send_message_request($origin, $params = NULL) {
+  if (!module_exists('message_broker_producer')) return FALSE;
+
   $payload = array(
     'activity' => $origin,
     'email' => $params['email'],
@@ -446,8 +448,13 @@ function dosomething_user_send_message_request($origin, $params = NULL) {
       );
       break;
   }
-  if (module_exists('message_broker_producer')) {
-    message_broker_producer_request('produceTransactional', $payload);
+
+  try {
+    return message_broker_producer_request('produceTransactional', $payload);
+  }
+  catch (Exception $e){
+    watchdog('dosomething_user', $e, array(), WATCHDOG_ERROR);
+    return FALSE;
   }
 }
 

From aa6cea3d8eafbb5f958aa1cc4107a99ccb5a567c Mon Sep 17 00:00:00 2001
From: Aaron Schachter <aaronschachter@gmail.com>
Date: Wed, 5 Mar 2014 11:22:55 -0500
Subject: [PATCH 3/3] Make title optional in set_signup_message

---
 .../dosomething_signup/dosomething_signup.module      | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/modules/dosomething/dosomething_signup/dosomething_signup.module b/lib/modules/dosomething/dosomething_signup/dosomething_signup.module
index 862fa7a3d..256ec31ca 100644
--- a/lib/modules/dosomething/dosomething_signup/dosomething_signup.module
+++ b/lib/modules/dosomething/dosomething_signup/dosomething_signup.module
@@ -307,10 +307,15 @@ function dosomething_signup_user_signup($nid, $account = NULL) {
  * Sets Drupal message for a signup for given $title.
  *
  * @param string $title
- *   Title to display within the Drupal message.
+ *   Optional - Title of whatever user has signed up for.
  */
-function dosomething_signup_set_signup_message($title) {
-  $message = t("You're signed up for") . ' <em>' . $title . '</em>! ';
+function dosomething_signup_set_signup_message($title = NULL) {
+  // If title exists:
+  if ($title) {
+    // Prepare it for the message.
+    $title = ' ' . t("for") . ' <em>' . $title . '</em>';
+  }
+  $message = t("You're signed up") . $title . '! ';
   $message .=  t("Get started below.");
   drupal_set_message($message);
 }