Changeset 21598


Ignore:
Timestamp:
Mar 16, 2013, 1:35:19 PM (8 years ago)
Author:
Eric
Message:

Bug 2870 fixed - Error in tracking confirmation tab if $confdefault_user_id is set with an ID different than Guest user ID

Location:
extensions/UserAdvManager/trunk
Files:
3 edited

Legend:

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

    r21075 r21598  
    13361336          'GROUPS'           => $groups_string,
    13371337          'REGISTRATION'     => $local_user['registration_date'],
    1338           'REMINDER'         => $reminder,    
     1338          'REMINDER'         => $reminder,   
    13391339          'EXPIRATION'       => $expiration,
    13401340        )
  • extensions/UserAdvManager/trunk/changelog.txt.php

    r21519 r21598  
    398398            Update tr_TR, thanks to : LazBoy
    399399            Update it_IT, thanks to : Ericnet
    400            
     400
     401-- 2.50.3 : Bug 2870 fixed - Error in tracking confirmation tab if $conf['default_user_id'] is set with an ID different than Guest user ID
    401402*/
    402403?>
  • extensions/UserAdvManager/trunk/include/functions.inc.php

    r21519 r21598  
    26292629    ON u.'.$conf['user_fields']['id'].' = ug.user_id
    26302630WHERE u.'.$conf['user_fields']['id'].' >= 3
     2631  AND u.'.$conf['user_fields']['id'].' <> '.$conf['default_user_id'].'
    26312632  AND (TO_DAYS(NOW()) - TO_DAYS(ui.registration_date) >= "'.$conf_UAM_ConfirmMail['CONFIRMMAIL_DELAY'].'"
    26322633  OR TO_DAYS(NOW()) - TO_DAYS(ui.registration_date) < "'.$conf_UAM_ConfirmMail['CONFIRMMAIL_DELAY'].'")
     
    27042705    ON u.'.$conf['user_fields']['id'].' = ui.user_id
    27052706WHERE u.'.$conf['user_fields']['id'].' >= 3
     2707  AND u.'.$conf['user_fields']['id'].' <> '.$conf['default_user_id'].'
    27062708  AND (TO_DAYS(NOW()) - TO_DAYS(ui.registration_date) >= "'.$conf_UAM_ConfirmMail['CONFIRMMAIL_DELAY'].'")
    27072709ORDER BY ui.registration_date ASC;';
     
    27442746    ON u.'.$conf['user_fields']['id'].' = lv.user_id
    27452747WHERE (TO_DAYS(NOW()) - TO_DAYS(lv.lastvisit) >= "'.$conf_UAM['GHOSTRACKER_DAYLIMIT'].'")
     2748AND u.'.$conf['user_fields']['id'].' <> '.$conf['default_user_id'].'
    27462749ORDER BY lv.lastvisit ASC;';
    27472750
     
    27912794    ON u.'.$conf['user_fields']['id'].' = lv.user_id
    27922795WHERE (TO_DAYS(NOW()) - TO_DAYS(lv.lastvisit) >= "'.$conf_UAM['GHOSTRACKER_DAYLIMIT'].'")
     2796AND u.'.$conf['user_fields']['id'].' <> '.$conf['default_user_id'].'
    27932797ORDER BY lv.lastvisit ASC;';
    27942798
     
    28272831    ON u.'.$conf['user_fields']['id'].' = ug.user_id
    28282832WHERE u.'.$conf['user_fields']['id'].' >= 3
     2833  AND u.'.$conf['user_fields']['id'].' <> '.$conf['default_user_id'].'
    28292834  AND u.username NOT LIKE "16"
    28302835  AND u.username NOT LIKE "18"
Note: See TracChangeset for help on using the changeset viewer.