mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-08 04:18:52 +00:00
Merge branch 'ticket/17137' into ticket/17137-master
This commit is contained in:
commit
4ee1dc9ecf
1 changed files with 1 additions and 1 deletions
|
@ -145,7 +145,7 @@ class ucp_attachments
|
||||||
$pagination = $phpbb_container->get('pagination');
|
$pagination = $phpbb_container->get('pagination');
|
||||||
$start = $pagination->validate_start($start, $config['topics_per_page'], $num_attachments);
|
$start = $pagination->validate_start($start, $config['topics_per_page'], $num_attachments);
|
||||||
|
|
||||||
$sql = 'SELECT a.*, t.topic_title, pr.message_subject as message_title, pr.message_time as message_time, pt.folder_id, p.post_edit_locked, t.topic_status, f.forum_id, f.forum_status
|
$sql = 'SELECT a.*, t.topic_title, pr.message_subject as message_title, pr.message_time as message_time, pt.folder_id, p.post_edit_locked, p.post_time, t.topic_status, f.forum_id, f.forum_status
|
||||||
FROM ' . ATTACHMENTS_TABLE . ' a
|
FROM ' . ATTACHMENTS_TABLE . ' a
|
||||||
LEFT JOIN ' . POSTS_TABLE . ' p ON (a.post_msg_id = p.post_id AND a.in_message = 0)
|
LEFT JOIN ' . POSTS_TABLE . ' p ON (a.post_msg_id = p.post_id AND a.in_message = 0)
|
||||||
LEFT JOIN ' . TOPICS_TABLE . ' t ON (a.topic_id = t.topic_id AND a.in_message = 0)
|
LEFT JOIN ' . TOPICS_TABLE . ' t ON (a.topic_id = t.topic_id AND a.in_message = 0)
|
||||||
|
|
Loading…
Add table
Reference in a new issue