Changeset 702 for trunk/forum/includes/acp/acp_email.php
- Timestamp:
- Mar 31, 2010, 6:32:40 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/forum/includes/acp/acp_email.php
r400 r702 3 3 * 4 4 * @package acp 5 * @version $Id : acp_email.php 8479 2008-03-29 00:22:48Z naderman$5 * @version $Id$ 6 6 * @copyright (c) 2005 phpBB Group 7 7 * @license http://opensource.org/licenses/gpl-license.php GNU Public License … … 109 109 trigger_error($user->lang['NO_USER'] . adm_back_link($this->u_action), E_USER_WARNING); 110 110 } 111 111 112 112 $i = $j = 0; 113 113 … … 122 122 if (($row['user_notify_type'] == NOTIFY_EMAIL && $row['user_email']) || 123 123 ($row['user_notify_type'] == NOTIFY_IM && $row['user_jabber']) || 124 ($row['user_notify_type'] == NOTIFY_BOTH && $row['user_email'] && $row['user_jabber']))124 ($row['user_notify_type'] == NOTIFY_BOTH && ($row['user_email'] || $row['user_jabber']))) 125 125 { 126 126 if ($i == $max_chunk_size || $row['user_lang'] != $old_lang || $row['user_notify_type'] != $old_notify_type) … … 174 174 $messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']); 175 175 $messenger->headers('X-AntiAbuse: User IP - ' . $user->ip); 176 176 177 177 $messenger->subject(htmlspecialchars_decode($subject)); 178 178 $messenger->set_mail_priority($priority); … … 182 182 'MESSAGE' => htmlspecialchars_decode($message)) 183 183 ); 184 184 185 185 if (!($messenger->send($used_method))) 186 186 { … … 240 240 $select_list = '<option value="0"' . ((!$group_id) ? ' selected="selected"' : '') . '>' . $user->lang['ALL_USERS'] . '</option>'; 241 241 $select_list .= group_select_options($group_id, $exclude); 242 242 243 243 $s_priority_options = '<option value="' . MAIL_LOW_PRIORITY . '">' . $user->lang['MAIL_LOW_PRIORITY'] . '</option>'; 244 244 $s_priority_options .= '<option value="' . MAIL_NORMAL_PRIORITY . '" selected="selected">' . $user->lang['MAIL_NORMAL_PRIORITY'] . '</option>';
Note:
See TracChangeset
for help on using the changeset viewer.