Ignore:
Timestamp:
Aug 21, 2010, 10:51:00 PM (14 years ago)
Author:
Eric
Message:

Merge from Trunk to Branch 2.15

File:
1 edited

Legend:

Unmodified
Added
Removed

  • extensions/NBC_UserAdvManager/branches/2.15/include/functions.inc.php

    r6776 r6787  
    387387    }
    388388   
    389     return get_absolute_root_url().UAM_PATH.'ConfirmMail.php?key='.$Confirm_Mail_ID;
     389    return get_absolute_root_url().UAM_PATH.'ConfirmMail.php?key='.$Confirm_Mail_ID.'&userid='.$user_id;
    390390  }
    391391}
    … …  
    458458                pwg_query($query);
    459459   
    460     return get_absolute_root_url().UAM_PATH.'ConfirmMail.php?key='.$Confirm_Mail_ID;
     460    return get_absolute_root_url().UAM_PATH.'ConfirmMail.php?key='.$Confirm_Mail_ID.'&userid='.$user_id;
    461461  }
    462462}
    … …  
    505505  $tab = array();
    506506
    507   $query = "
     507  $query = '
    508508SELECT value
    509 FROM ".CONFIG_TABLE."
    510 WHERE param = 'UserAdvManager_Redir'
    511 ;";
     509FROM '.CONFIG_TABLE.'
     510WHERE param = "UserAdvManager_Redir"
     511;';
    512512
    513513  $tab = pwg_db_fetch_row(pwg_query($query));
    … …  
    527527
    528528/* Function called from ConfirmMail.php to verify validation key used by user according time limit */
     529/* Return true is key validation is OK else return false */
    529530function VerifyConfirmMail($id)
    530531{
Note: See TracChangeset for help on using the changeset viewer.