diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-11-20 00:46:45 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-11-20 00:46:45 -0500 |
| commit | 08032068c0b8d6ebe36484603a6d9b61608e222e (patch) | |
| tree | 0fd411808f2ee25c957bc4c3030a8eb0a5a43424 /phpBB/includes/mcp/mcp_reports.php | |
| parent | 936fd38ee6237592ca1e326e7e8fed8efd8557cd (diff) | |
| parent | 6a2b13632de1ab39cdd126785a4aa2057fa9d6ab (diff) | |
| download | forums-08032068c0b8d6ebe36484603a6d9b61608e222e.tar forums-08032068c0b8d6ebe36484603a6d9b61608e222e.tar.gz forums-08032068c0b8d6ebe36484603a6d9b61608e222e.tar.bz2 forums-08032068c0b8d6ebe36484603a6d9b61608e222e.tar.xz forums-08032068c0b8d6ebe36484603a6d9b61608e222e.zip | |
Merge remote-tracking branch 'nickvergessen/ticket/10344' into develop
* nickvergessen/ticket/10344:
[ticket/10344] Add attachment icons to list of reported and queued posts/topics
Diffstat (limited to 'phpBB/includes/mcp/mcp_reports.php')
| -rw-r--r-- | phpBB/includes/mcp/mcp_reports.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php index b672eac9e4..dac73b900f 100644 --- a/phpBB/includes/mcp/mcp_reports.php +++ b/phpBB/includes/mcp/mcp_reports.php @@ -368,7 +368,7 @@ class mcp_reports if (sizeof($report_ids)) { - $sql = 'SELECT t.forum_id, t.topic_id, t.topic_title, p.post_id, p.post_subject, p.post_username, p.poster_id, p.post_time, u.username, u.username_clean, u.user_colour, r.user_id as reporter_id, ru.username as reporter_name, ru.user_colour as reporter_colour, r.report_time, r.report_id + $sql = 'SELECT t.forum_id, t.topic_id, t.topic_title, p.post_id, p.post_subject, p.post_username, p.poster_id, p.post_time, p.post_attachment, u.username, u.username_clean, u.user_colour, r.user_id as reporter_id, ru.username as reporter_name, ru.user_colour as reporter_colour, r.report_time, r.report_id FROM ' . REPORTS_TABLE . ' r, ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t, ' . USERS_TABLE . ' u, ' . USERS_TABLE . ' ru WHERE ' . $db->sql_in_set('r.report_id', $report_ids) . ' AND t.topic_id = p.topic_id @@ -403,8 +403,9 @@ class mcp_reports 'POST_TIME' => $user->format_date($row['post_time']), 'REPORT_ID' => $row['report_id'], 'REPORT_TIME' => $user->format_date($row['report_time']), - 'TOPIC_TITLE' => $row['topic_title']) - ); + 'TOPIC_TITLE' => $row['topic_title'], + 'ATTACH_ICON_IMG' => ($auth->acl_get('u_download') && $auth->acl_get('f_download', $row['forum_id']) && $row['post_attachment']) ? $user->img('icon_topic_attach', $user->lang['TOTAL_ATTACHMENTS']) : '', + )); } $db->sql_freeresult($result); unset($report_ids, $row); |