Ignore:
Timestamp:
03/31/12 18:39:21 (8 years ago)
Author:
Eric
Message:

r13841 merged from trunk
Bug 2603 fixed - Php notice when user changes his email in his profile if confirmation by email is set

File:
1 edited

Legend:

Unmodified
Added
Removed
  • extensions/UserAdvManager/branches/2.40/include/functions.inc.php

    r13825 r13842  
    284284    if (isset($conf_UAM[38]) and $conf_UAM[38] == 'true' and UAM_check_pwgreset($user['id'])) 
    285285    { 
    286       // if password not changed then pwdreset filed = true else pwdreset field = false 
     286      // if password not changed then pwdreset field = true else pwdreset field = false 
    287287      // ------------------------------------------------------------------------------ 
    288288      if (!empty($_POST['use_new_pwd'])) 
     
    346346        if ($_POST['mail_address'] != $current_email and (isset($conf_UAM[1]) and $conf_UAM[1] == 'local')) 
    347347         
    348           SetPermission($register_user['id']);// Set to "waiting" group or status until admin validation 
     348          SetPermission($user['id']);// Set to "waiting" group or status until admin validation 
    349349          $confirm_mail_need = false; 
    350350      } 
     
    15951595  } 
    15961596 
    1597   if (!is_admin() and $conf_UAM[2] <> -1) // Set privacy level 
     1597  if (!is_admin() and $conf_UAM[35] <> -1) // Set privacy level 
    15981598  { 
    15991599    $query = " 
     
    16011601  (user_id, level) 
    16021602VALUES 
    1603   ('".$user_id."', '".$conf_UAM[level]."') 
     1603  ('".$user_id."', '".$conf_UAM[35]."') 
    16041604;"; 
    16051605    pwg_query($query); 
Note: See TracChangeset for help on using the changeset viewer.