Changeset 17987
- Timestamp:
- Sep 18, 2012, 7:13:01 PM (12 years ago)
- Location:
- extensions/UserAdvManager/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/UserAdvManager/trunk/ConfirmMail.php
r17985 r17987 39 39 { 40 40 $status = true; 41 42 41 log_user($userid, false); 43 42 if (isset($conf_UAM[1]) and $conf_UAM[1] == 'local') -
extensions/UserAdvManager/trunk/include/functions.inc.php
r17986 r17987 1190 1190 WHERE i.status in (\'webmaster\', \'admin\') 1191 1191 AND '.$conf['user_fields']['email'].' IS NOT NULL 1192 AND i.user_id <> '.$user['id'].'1193 1192 ORDER BY username 1194 1193 ;'; … … 1630 1629 $patterns[] = '#\[mygallery\]#i'; 1631 1630 $replacements[] = $conf['gallery_title']; 1632 1633 1631 if (function_exists('get_user_language_desc')) 1634 1632 { 1635 1633 $subject = get_user_language_desc(preg_replace($patterns, $replacements, $conf_UAM[46]))."\n\n"; 1636 1634 } 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"; 1638 1636 } 1639 1637 … … 1648 1646 $patterns[] = '#\[myurl\]#i'; 1649 1647 $replacements[] = get_gallery_home_url(); 1650 1651 1648 if (function_exists('get_user_language_desc')) 1652 1649 { 1653 1650 $custom_txt = get_user_language_desc(preg_replace($patterns, $replacements, $conf_UAM[27]))."\n\n"; 1654 1651 } 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"; 1656 1653 } 1657 1654
Note: See TracChangeset
for help on using the changeset viewer.