diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-01-06 01:14:09 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-01-06 01:14:09 +0100 |
| commit | 91637f80703b0942e0eed268c79aaab0f5f6b81f (patch) | |
| tree | ce9d04d322d3db2ee64c7751643135307048688a | |
| parent | 70cf5ddf9d09cf6f4598ee5ac6e4de0d0a0f33f6 (diff) | |
| parent | 4c550c221bebed3e45dec49fa741b02c608fa446 (diff) | |
| download | forums-91637f80703b0942e0eed268c79aaab0f5f6b81f.tar forums-91637f80703b0942e0eed268c79aaab0f5f6b81f.tar.gz forums-91637f80703b0942e0eed268c79aaab0f5f6b81f.tar.bz2 forums-91637f80703b0942e0eed268c79aaab0f5f6b81f.tar.xz forums-91637f80703b0942e0eed268c79aaab0f5f6b81f.zip | |
Merge pull request #4608 from marc1706/ticket/14954
[ticket/14954] Properly check if topic has attachments in mcp_queue
| -rw-r--r-- | phpBB/includes/mcp/mcp_queue.php | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/mcp_queue.html | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php index 9060cc1098..f379392b12 100644 --- a/phpBB/includes/mcp/mcp_queue.php +++ b/phpBB/includes/mcp/mcp_queue.php @@ -577,7 +577,7 @@ class mcp_queue 'POST_SUBJECT' => ($row['post_subject'] != '') ? $row['post_subject'] : $user->lang['NO_SUBJECT'], 'TOPIC_TITLE' => $row['topic_title'], 'POST_TIME' => $user->format_date($row['post_time']), - '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']) : '', + 'S_HAS_ATTACHMENTS' => $auth->acl_get('u_download') && $auth->acl_get('f_download', $row['forum_id']) && $row['post_attachment'], )); } unset($rowset, $forum_names); diff --git a/phpBB/styles/prosilver/template/mcp_queue.html b/phpBB/styles/prosilver/template/mcp_queue.html index c82aae5f8c..ee69bf448d 100644 --- a/phpBB/styles/prosilver/template/mcp_queue.html +++ b/phpBB/styles/prosilver/template/mcp_queue.html @@ -48,7 +48,7 @@ <dl> <dt> <div class="list-inner"> - <a href="{postrow.U_VIEW_DETAILS}" class="topictitle">{postrow.POST_SUBJECT}</a> <i class="icon fa-paperclip fa-fw" aria-hidden="true"></i> <br /> + <a href="{postrow.U_VIEW_DETAILS}" class="topictitle">{postrow.POST_SUBJECT}</a><!-- IF postrow.S_HAS_ATTACHMENTS --> <i class="icon fa-paperclip fa-fw" aria-hidden="true"></i> <!-- ENDIF --><br /> <span>{L_POSTED} {L_POST_BY_AUTHOR} {postrow.POST_AUTHOR_FULL} » {postrow.POST_TIME}</span> </div> </dt> |