diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-01-30 16:01:15 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-01-30 16:01:15 +0000 |
| commit | 325ff1fa1b0f75b7da6a6abbc9d6bbf032bcdedf (patch) | |
| tree | 5d5d1e996619f25c282a0fa9e4cb42531c3f2b85 /phpBB/includes/functions_privmsgs.php | |
| parent | c7821700dd36899a53b8afe9f859d7a40a23e7b4 (diff) | |
| download | forums-325ff1fa1b0f75b7da6a6abbc9d6bbf032bcdedf.tar forums-325ff1fa1b0f75b7da6a6abbc9d6bbf032bcdedf.tar.gz forums-325ff1fa1b0f75b7da6a6abbc9d6bbf032bcdedf.tar.bz2 forums-325ff1fa1b0f75b7da6a6abbc9d6bbf032bcdedf.tar.xz forums-325ff1fa1b0f75b7da6a6abbc9d6bbf032bcdedf.zip | |
One commit for those fixes having a very tiny impact (mostly only whitespaces or forgotten spans, etc.)
Although i somehow mistakingly got #20445 and #15249 into it. :/
Removing s_watching_img from watch_topic_forum() function (Bug #20445)
Changing order for post review if more than one post affected (Bug #15249)
Language typos/fixes (Bug #20425, #15719, #15429, #14669, #13479)
Style/Template fixes (Bug #20065, #19405, #19205, #15028, #14934, #14821, #14752, #14497, #13707, #14738)
Tiny code fixes (Bug #20165, #20025, #19795, #14804)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8350 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_privmsgs.php')
| -rw-r--r-- | phpBB/includes/functions_privmsgs.php | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php index 5476517440..bffa64158a 100644 --- a/phpBB/includes/functions_privmsgs.php +++ b/phpBB/includes/functions_privmsgs.php @@ -276,7 +276,7 @@ function check_rule(&$rules, &$rule_row, &$message_row, $user_id) case ACTION_PLACE_INTO_FOLDER: return array('action' => $rule_row['rule_action'], 'folder_id' => $rule_row['rule_folder_id']); break; - + case ACTION_MARK_AS_READ: case ACTION_MARK_AS_IMPORTANT: return array('action' => $rule_row['rule_action'], 'pm_unread' => $message_row['pm_unread'], 'pm_marked' => $message_row['pm_marked']); @@ -304,7 +304,7 @@ function check_rule(&$rules, &$rule_row, &$message_row, $user_id) return false; break; - + default: return false; } @@ -606,7 +606,7 @@ function place_pm_into_folder(&$global_privmsgs_rules, $release = false) unset($sql_folder); - if (in_array(PRIVMSGS_INBOX, array_keys($move_into_folder))) + if (isset($move_into_folder[PRIVMSGS_INBOX])) { $sql = 'SELECT COUNT(msg_id) as num_messages FROM ' . PRIVMSGS_TO_TABLE . " @@ -892,7 +892,7 @@ function handle_mark_actions($user_id, $mark_action) if (confirm_box(true)) { delete_pm($user_id, $msg_ids, $cur_folder_id); - + $success_msg = (sizeof($msg_ids) == 1) ? 'MESSAGE_DELETED' : 'MESSAGES_DELETED'; $redirect = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&folder=' . $cur_folder_id); @@ -1034,8 +1034,8 @@ function delete_pm($user_id, $msg_ids, $folder_id) $user->data['user_new_privmsg'] -= $num_new; $user->data['user_unread_privmsg'] -= $num_unread; } - - // Now we have to check which messages we can delete completely + + // Now we have to check which messages we can delete completely $sql = 'SELECT msg_id FROM ' . PRIVMSGS_TO_TABLE . ' WHERE ' . $db->sql_in_set('msg_id', array_keys($delete_rows)); @@ -1157,7 +1157,7 @@ function write_pm_addresses($check_ary, $author_id, $plaintext = false) FROM ' . GROUPS_TABLE . ' WHERE ' . $db->sql_in_set('group_id', $g); $result = $db->sql_query($sql); - + while ($row = $db->sql_fetchrow($result)) { if ($check_type == 'to' || $author_id == $user->data['user_id'] || $row['user_id'] == $user->data['user_id']) @@ -1175,7 +1175,7 @@ function write_pm_addresses($check_ary, $author_id, $plaintext = false) AND g.group_id = ug.group_id AND ug.user_pending = 0'; $result = $db->sql_query($sql); - + while ($row = $db->sql_fetchrow($result)) { if (!isset($address['group'][$row['group_id']])) @@ -1331,7 +1331,7 @@ function submit_pm($mode, $subject, &$data, $put_in_outbox = true) AND u.user_id = ug.user_id AND u.user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ')'; $result = $db->sql_query($sql); - + while ($row = $db->sql_fetchrow($result)) { $field = ($data['address_list']['g'][$row['group_id']] == 'to') ? 'to' : 'bcc'; @@ -1506,7 +1506,7 @@ function submit_pm($mode, $subject, &$data, $put_in_outbox = true) foreach ($data['attachment_data'] as $pos => $attach_row) { - if ($attach_row['is_orphan'] && !in_array($attach_row['attach_id'], array_keys($orphan_rows))) + if ($attach_row['is_orphan'] && !isset($orphan_rows[$attach_row['attach_id']])) { continue; } |