Skip to content

Instantly share code, notes, and snippets.

Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save xurizaemon/f2398e846f33424cda96b6da5349ba15 to your computer and use it in GitHub Desktop.
Save xurizaemon/f2398e846f33424cda96b6da5349ba15 to your computer and use it in GitHub Desktop.
commit 6f867351ee0161586af846e31b2fed9817d1d964
Author: Chris Burgess <chrisburgess@catalyst.net.nz>
Date: Tue Nov 6 09:36:56 2018 +1300
Issue #2998712: Replace drupal_set_message() with \Drupal::messenger()->addMessage()
diff --git a/modules/mailchimp_campaign/mailchimp_campaign.module b/modules/mailchimp_campaign/mailchimp_campaign.module
index 268fc76..6134969 100644
--- a/modules/mailchimp_campaign/mailchimp_campaign.module
+++ b/modules/mailchimp_campaign/mailchimp_campaign.module
@@ -126,7 +126,7 @@ function mailchimp_campaign_save_campaign($template, $recipients, $settings, $te
}
}
catch (Exception $e) {
- drupal_set_message($e->getMessage(), 'error');
+ \Drupal::messenger()->addMessage($e->getMessage(), 'error');
\Drupal::logger('mailchimp_campaign')->error('An error occurred while creating this campaign: {message}', array(
'message' => $e->getMessage()));
return NULL;
@@ -148,7 +148,7 @@ function mailchimp_campaign_save_campaign($template, $recipients, $settings, $te
}
}
catch (Exception $e) {
- drupal_set_message($e->getMessage(), 'error');
+ \Drupal::messenger()->addMessage($e->getMessage(), 'error');
\Drupal::logger('mailchimp_campaign')->error(
'An error occurred while updating this campaign: @msg',
array('@msg' => $e->getMessage()));
@@ -157,7 +157,7 @@ function mailchimp_campaign_save_campaign($template, $recipients, $settings, $te
}
if (!empty($result->id)) {
- drupal_set_message(t('Campaign %name (%cid) was successfully saved.',
+ \Drupal::messenger()->addMessage(t('Campaign %name (%cid) was successfully saved.',
array('%name' => $settings->title, '%cid' => $campaign_id)));
// Clear cached data for this campaign.
@@ -206,7 +206,7 @@ function mailchimp_campaign_send_campaign(MailchimpCampaign $campaign) {
}
}
catch (Exception $e) {
- drupal_set_message($e->getMessage(), 'error');
+ \Drupal::messenger()->addMessage($e->getMessage(), 'error');
\Drupal::logger('mailchimp_campaign')
->error('An error occurred while sending to this campaign: {message}', array(
'message' => $e->getMessage()
@@ -236,7 +236,7 @@ function mailchimp_campaign_delete_campaign(MailchimpCampaign $campaign) {
}
catch (Exception $e) {
- drupal_set_message($e->getMessage(), 'error');
+ \Drupal::messenger()->addMessage($e->getMessage(), 'error');
\Drupal::logger('mailchimp_campaign')->error('An error occurred while deleting this campaign: {message}', array(
'message' => $e->getMessage()));
return FALSE;
@@ -286,7 +286,7 @@ function mailchimp_campaign_list_templates($reset = FALSE) {
}
}
catch (Exception $e) {
- drupal_set_message($e->getMessage(), 'error');
+ \Drupal::messenger()->addMessage($e->getMessage(), 'error');
\Drupal::logger('mailchimp_campaign')->error('An error occurred while retrieving templates: {message}', array(
'message' => $e->getMessage()));
return FALSE;
@@ -395,7 +395,7 @@ function mailchimp_campaign_get_campaigns($mc_campaign_ids, $reset = FALSE) {
}
}
catch (Exception $e) {
- drupal_set_message($e->getMessage(), 'error');
+ \Drupal::messenger()->addMessage($e->getMessage(), 'error');
\Drupal::logger('mailchimp_campaign')->error('An error occurred while getting campaigns: {message}', array(
'message' => $e->getMessage()));
@@ -411,7 +411,7 @@ function mailchimp_campaign_get_campaigns($mc_campaign_ids, $reset = FALSE) {
}
}
catch(Exception $e) {
- drupal_set_message($e->getMessage() . ' (Campaign ' . $campaign_id . ' removed from MailChimp?)', 'error');
+ \Drupal::messenger()->addMessage($e->getMessage() . ' (Campaign ' . $campaign_id . ' removed from MailChimp?)', 'error');
\Drupal::logger('mailchimp_campaign')->error('An error occurred while getting campaigns: {message}', array(
'message' => $e->getMessage()));
}
@@ -447,7 +447,7 @@ function mailchimp_campaign_get_list_segments($list_id, $type) {
$response = $mcapi->getSegments($list_id, $parameters);
}
catch (Exception $e) {
- drupal_set_message($e->getMessage(), 'error');
+ \Drupal::messenger()->addMessage($e->getMessage(), 'error');
\Drupal::logger('mailchimp_campaign')->error('An error occurred getting list segments for list ID {list_id}: {message} ', array(
'list_id' => $list_id,
'message' => $e->getMessage(),
@@ -478,7 +478,7 @@ function mailchimp_test_list_segment($list_id, $list_segment_id) {
$result = $mc_lists->getSegmentMembers($list_id, $list_segment_id, array('count' => 500));
}
catch (Exception $e) {
- drupal_set_message($e->getMessage(), 'error');
+ \Drupal::messenger()->addMessage($e->getMessage(), 'error');
\Drupal::logger('mailchimp_campaign')->error('An error occurred testing a list segment: {message}', array(
'message' => $e->getMessage()));
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment