Changeset 17987


Ignore:
Timestamp:
09/18/12 19:13:01 (7 years ago)
Author:
flop25
Message:

one correction

Location:
extensions/UserAdvManager/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • extensions/UserAdvManager/trunk/ConfirmMail.php

    r17985 r17987  
    3939  { 
    4040    $status = true; 
    41      
    4241    log_user($userid, false); 
    4342    if (isset($conf_UAM[1]) and $conf_UAM[1] == 'local') 
  • extensions/UserAdvManager/trunk/include/functions.inc.php

    r17986 r17987  
    11901190      WHERE i.status in (\'webmaster\',  \'admin\') 
    11911191        AND '.$conf['user_fields']['email'].' IS NOT NULL 
    1192         AND i.user_id <> '.$user['id'].' 
    11931192      ORDER BY username 
    11941193    ;'; 
     
    16301629    $patterns[] = '#\[mygallery\]#i'; 
    16311630    $replacements[] = $conf['gallery_title']; 
    1632  
    16331631    if (function_exists('get_user_language_desc')) 
    16341632    { 
    16351633      $subject = get_user_language_desc(preg_replace($patterns, $replacements, $conf_UAM[46]))."\n\n"; 
    16361634    } 
    1637     else $subject = l10n(preg_replace($patterns, $replacements, $conf_UAM[46]))."\n\n";  
     1635    else $subject = l10n(preg_replace($patterns, $replacements, $conf_UAM[46]))."\n\n"; 
    16381636  } 
    16391637       
     
    16481646    $patterns[] = '#\[myurl\]#i'; 
    16491647    $replacements[] = get_gallery_home_url(); 
    1650  
    16511648    if (function_exists('get_user_language_desc')) 
    16521649    { 
    16531650      $custom_txt = get_user_language_desc(preg_replace($patterns, $replacements, $conf_UAM[27]))."\n\n"; 
    16541651    } 
    1655     else $custom_txt = l10n(preg_replace($patterns, $replacements, $conf_UAM[27]))."\n\n";  
     1652    else $custom_txt = l10n(preg_replace($patterns, $replacements, $conf_UAM[27]))."\n\n"; 
    16561653  } 
    16571654 
Note: See TracChangeset for help on using the changeset viewer.