Commit 23e85139 authored by Neil Drumm's avatar Neil Drumm 👋
Browse files

Issue #3300812 by drumm: Remove multiple email syncing

parent 607dd8ee

versioncontrol_gitlab.module

+8 −1
Original line number Diff line number Diff line
@@ -227,6 +227,7 @@ function _versioncontrol_gitlab_user_info(stdClass $account) { 
  $info = [

    'username' => $account->git_username,

    'name' => $account->name,

    'email' => $account->mail,

    'website_url' => url('user/' . $account->uid, ['absolute' => TRUE]),

  ] + variable_get('versioncontrol_gitlab_user_info', []);

  drupal_alter('versioncontrol_gitlab_user_info', $info, $account);
@@ -273,9 +274,15 @@ function versioncontrol_gitlab_sync_emails(stdClass $account) { 
    $emails = multiple_email_load_addresses($account->uid);

    // First item is an array of both confirmed & unconfirmed emails, discard it.

    array_shift($emails);



    $drupalorg_commit_mail = new stdClass();

    $drupalorg_commit_mail->confirmed = TRUE;

    $drupalorg_commit_mail->email = $account->git_username . '@' . $account->uid . '.no-reply.drupal.org';

    $emails[] = $drupalorg_commit_mail;



    $drupal_emails = [];

    foreach ($emails as $email) {

      if ($email->confirmed) {

      if ($email->confirmed && empty($email->primary_address)) {

        $drupal_emails[drupal_strtolower($email->email)] = TRUE;

        if (!isset($gitlab_emails[drupal_strtolower($email->email)])) {

          try {