mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[ticket/16345] Small improvements

Browse Source 
PHPBB3-16346
This commit is contained in:
rubencm
2020-06-07 02:15:35 +00:00
parent 3cceeb45bf
commit 774c609c4a
284 changed files with 1380 additions and 835 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
phpBB/includes/functions_privmsgs.php
View File

@@ -455,7 +455,7 @@ function place_pm_into_folder(&$global_privmsgs_rules, $release = false)
}
else
{
$user_rules = $zebra = $check_rows = array();
$zebra = $check_rows = array();
$user_ids = $memberships = array();
// First of all, grab all rules and retrieve friends/foes
@@ -551,7 +551,7 @@ function place_pm_into_folder(&$global_privmsgs_rules, $release = false)
// It is allowed to execute actions more than once, except placing messages into folder
$folder_action = $message_removed = false;
foreach ($msg_ary as $pos => $rule_ary)
foreach ($msg_ary as $rule_ary)
{
if ($folder_action && $rule_ary['action'] == ACTION_PLACE_INTO_FOLDER)
{
@@ -1598,7 +1598,7 @@ function get_folder_status($folder_id, $folder)
*/
function submit_pm($mode, $subject, &$data_ary, $put_in_outbox = true)
{
global $db, $auth, $config, $user, $phpbb_root_path, $phpbb_container, $phpbb_dispatcher, $request;
global $db, $auth, $config, $user, $phpbb_container, $phpbb_dispatcher, $request;
$attachment_storage = $phpbb_container->get('storage.attachment');
@@ -1827,7 +1827,7 @@ function submit_pm($mode, $subject, &$data_ary, $put_in_outbox = true)
$space_taken = $files_added = 0;
$orphan_rows = array();
foreach ($data_ary['attachment_data'] as $pos => $attach_row)
foreach ($data_ary['attachment_data'] as $attach_row)
{
$orphan_rows[(int) $attach_row['attach_id']] = array();
}
@@ -1850,7 +1850,7 @@ function submit_pm($mode, $subject, &$data_ary, $put_in_outbox = true)
$db->sql_freeresult($result);
}
foreach ($data_ary['attachment_data'] as $pos => $attach_row)
foreach ($data_ary['attachment_data'] as $attach_row)
{
if ($attach_row['is_orphan'] && !isset($orphan_rows[$attach_row['attach_id']]))
{