Commit 1d1db8c0 authored by git's avatar git Committed by Kent Shelley
Browse files

Issue #2887580 by Znak: Error in composer.json file

parent 1dd10c66

composer.json

+1 −1
Original line number Diff line number Diff line
@@ -11,6 +11,6 @@ 
    "source": "http://cgit.drupalcode.org/campaignmonitor"

  },

  "require": {

    "campaignmonitor/createsend-php": "{version}"

    "campaignmonitor/createsend-php": "^5.0.2"

  }

}

modules/campaignmonitor_registration/campaignmonitor_registration.module

+3 −6
Original line number Diff line number Diff line
@@ -31,11 +31,11 @@ function campaignmonitor_registration_form_user_register_form_alter(&$form, Form 
    if (campaignmonitor_is_list_enabled($list_id) && $list_options && isset($list_options['display']['registration']) && $list_options['display']['registration']) {

      $options[$list_id] = $list['name'];

      $defaults = campaignmonitor_get_list_settings($list_id);

      if (isset($defaults['display']['description'])) {

        $option_descriptions[$list_id] = $defaults['display']['description'];



      }

    }



  }

  if (!empty($options)) {



    $form['campaignmonitor_checkbox'] = array(
@@ -121,13 +121,10 @@ function campaignmonitor_registration_form_user_register_submit(&$form, FormStat 
        $subscribe_now = TRUE;

        // Provide opportunity for modules to override the subscription process

        $result = Drupal::moduleHandler()->invokeAll('campaignmonitor_registration_submit', array($list_id,$values['mail']));

        \Drupal::logger('chorus_user')->notice(' result ' . print_r($result,1));



        // Modules can prevent immediate subscription

        if (isset($result['subscribe']) && $result['subscribe'] === 0) {

          $subscribe_now = FALSE;

          \Drupal::logger('chorus_user')->notice(' subscribe is false ');



        }



        if ($subscribe_now) {