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

Merge pull request #6500 from marc1706/ticket/15687

Browse Source 
[ticket/15687] Add attachment filename to attachment URL
This commit is contained in:
Marc Alexander
2023-07-26 15:19:36 +02:00
committed by GitHub
parent 2aa3b8f1ac c48092f6e7
commit 1712ee610a
10 changed files with 78 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
phpBB/includes/acp/acp_attachments.php
View File

@@ -1112,7 +1112,13 @@ class acp_attachments
'PHYSICAL_FILENAME' => utf8_basename($row['physical_filename']),
'ATTACH_ID' => $row['attach_id'],
'POST_ID' => (!empty($post_ids[$row['attach_id']])) ? $post_ids[$row['attach_id']] : '',
'U_FILE' => $this->controller_helper->route('phpbb_storage_attachment', ['file' => (int) $row['attach_id']])
'U_FILE' => $this->controller_helper->route(
'phpbb_storage_attachment',
[
'id' => (int) $row['attach_id'],
'filename' => $row['real_filename'],
]
),
]);
}
$db->sql_freeresult($result);
@@ -1302,7 +1308,13 @@ class acp_attachments
'S_IN_MESSAGE' => (bool) $row['in_message'],
'U_VIEW_TOPIC' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", "p={$row['post_msg_id']}") . "#p{$row['post_msg_id']}",
'U_FILE' => $this->controller_helper->route('phpbb_storage_attachment', ['file' => $row['attach_id']])
'U_FILE' => $this->controller_helper->route(
'phpbb_storage_attachment',
[
'id' => (int) $row['attach_id'],
'filename' => $row['real_filename'],
]
)
));
}

8
phpBB/includes/acp/acp_users.php
View File

@@ -2306,7 +2306,13 @@ class acp_users
'S_IN_MESSAGE' => $row['in_message'],
'U_DOWNLOAD' => $controller_helper->route('phpbb_storage_attachment', ['file' => (int) $row['attach_id']]),
'U_DOWNLOAD' => $controller_helper->route(
'phpbb_storage_attachment',
[
'id' => (int) $row['attach_id'],
'filename' => $row['real_filename'],
]
),
'U_VIEW_TOPIC' => $view_topic)
);
}