Changeset 17989


Ignore:
Timestamp:
09/18/12 19:20:03 (7 years ago)
Author:
Eric
Message:

fix svn conflict

File:
1 edited

Legend:

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

    r17988 r17989  
    11811181                if (isset($conf_UAM[1]) and $conf_UAM[1] == 'local') 
    11821182                { 
    1183 <<<<<<< .mine 
    1184                          $keyargs_content = array(); 
     1183                        $keyargs_content = array(); 
    11851184                $keyargs_content[] = get_l10n_args('Manual validation needed for %s', $username); 
    11861185                $keyargs_content[] = get_l10n_args('UAM_Link: %s', AddConfirmMail($id, $email)); 
     
    12141213#      'content' => (isset($infos1) ? $infos1_perso.l10n_args($infos1)."\n\n" : "").(isset($infos2) ? $infos2_perso.l10n_args($infos2)."\n\n" : "").get_absolute_root_url(), 
    12151214#    )); 
    1216 ======= 
    1217                 $admins = array(); 
    1218       $query = ' 
    1219     SELECT 
    1220         u.'.$conf['user_fields']['username'].' AS username, 
    1221         u.'.$conf['user_fields']['email'].' AS mail_address 
    1222       FROM '.USERS_TABLE.' AS u 
    1223         JOIN '.USER_INFOS_TABLE.' AS i ON i.user_id =  u.'.$conf['user_fields']['id'].' 
    1224       WHERE i.status in (\'webmaster\',  \'admin\') 
    1225         AND '.$conf['user_fields']['email'].' IS NOT NULL 
    1226       ORDER BY username 
    1227     ;'; 
    1228      
    1229       $datas = pwg_query($query); 
    1230       if (!empty($datas)) 
    1231       { 
    1232         while ($admin = pwg_db_fetch_assoc($datas)) 
    1233         { 
    1234           if (!empty($admin['mail_address'])) 
    1235           { 
    1236             array_push($admins, format_email($admin['username'], $admin['mail_address'])); 
    1237           } 
    1238         } 
    1239       } 
    1240       pwg_mail(implode(', ', $admins), array( 
    1241                 'subject' => $subject, 
    1242       'content' => (isset($infos1) ? $infos1_perso.l10n_args($infos1)."\n\n" : "").(isset($infos2) ? $infos2_perso.l10n_args($infos2)."\n\n" : "").get_absolute_root_url(), 
    1243     )); 
    1244 >>>>>>> .r17987 
    12451215                } 
    12461216                else 
     
    16641634    $patterns[] = '#\[mygallery\]#i'; 
    16651635    $replacements[] = $conf['gallery_title']; 
     1636 
    16661637    if (function_exists('get_user_language_desc')) 
    16671638    { 
Note: See TracChangeset for help on using the changeset viewer.