Changeset 14635


Ignore:
Timestamp:
May 1, 2012, 2:52:04 PM (8 years ago)
Author:
Eric
Message:

Bug 2628 fixed - Php notice when email is not mandatory for registration

Location:
extensions/UserAdvManager/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • extensions/UserAdvManager/trunk/admin/UAM_admin.php

    r13107 r14635  
    133133    $_POST['UAM_CustomRejectConnexion_Text'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_CustomRejectConnexion_Text'])));
    134134
     135
     136  // Check if emails are mandatory for registrations (needed for email exclusion option)
     137  // -----------------------------------------------------------------------------------
     138  if ($conf['obligatory_user_mail_address'])
     139  {
    135140    // Check if CR-LF exist at begining and end of mail exclusion list - If yes, removes them
    136141    // --------------------------------------------------------------------------------------
     
    140145      $UAM_Exclusionlist_Error = true;
    141146    }
     147  }
     148  elseif (!$conf['obligatory_user_mail_address'])
     149  {
     150    $_POST['UAM_MailExclusion_List'] = '';
     151  }
    142152
    143153    // Consistency check between ConfirmMail and AutoMail - We cannot use GTAutoMail if ConfirmMail is disabled
  • extensions/UserAdvManager/trunk/changelog.txt.php

    r14611 r14635  
    304304            Bug 2619 fixed - Confirmation email when registered user changes his email was not sent and user not demoted
    305305            Bug 2620 fixed - Display of ConfirmMail, rejected and del_account pages have been improved
     306            Bug 2628 fixed - Php notice when email is not mandatory for registration
    306307*/
    307308?>
Note: See TracChangeset for help on using the changeset viewer.