Ignore:
Timestamp:
Sep 30, 2011, 1:51:10 PM (13 years ago)
Author:
Eric
Message:

Merge r12271 from trunk to branch 2.30

File:
1 edited

Legend:

Unmodified
Added
Removed
  • extensions/UserAdvManager/branches/2.30/ConfirmMail.php

    r12227 r12272  
    4242    log_user($userid, false);
    4343
    44 /* We have to get the user's language in database */
     44// We have to get the user's language in database
     45// ----------------------------------------------
    4546    $query = '
    4647SELECT language
     
    5051    $data = pwg_db_fetch_assoc(pwg_query($query));
    5152
    52 /* Check if user is already registered (profile changing) - If not (new registration), language is set to current gallery language */
     53// Check if user is already registered (profile changing) - If not (new registration), language is set to current gallery language
     54// -------------------------------------------------------------------------------------------------------------------------------
    5355    if (empty($data))
    5456    {
    55 /* And switch gallery to this language before using personalized and multilangual contents */
     57// And switch gallery to this language before using personalized and multilangual contents
     58// ---------------------------------------------------------------------------------------
    5659      $language = pwg_get_session_var('lang_switch', $user['language']);
    5760      switch_lang_to($language);
     
    5962    else
    6063    {
    61 /* And switch gallery to this language before using personalized and multilangual contents */
     64// And switch gallery to this language before using personalized and multilangual contents
     65// ---------------------------------------------------------------------------------------
    6266      switch_lang_to($data['language']);
    6367      load_language('plugin.lang', UAM_PATH);
     
    6771    {
    6872      // Management of Extension flags ([username], [mygallery], [myurl])
     73      // ----------------------------------------------------------------
    6974      $patterns[] = '#\[username\]#i';
    7075      $replacements[] = $result['username'];
     
    99104    {
    100105      // Management of Extension flags ([username], [mygallery], [myurl])
     106      // ----------------------------------------------------------------
    101107      $patterns[] = '#\[username\]#i';
    102108      $replacements[] = $result['username'];
Note: See TracChangeset for help on using the changeset viewer.