diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-08-10 12:22:22 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-08-10 12:22:22 +0200 |
| commit | 1f6b9628e78f7a82eb2a3a455ef4a0448999dd68 (patch) | |
| tree | 2c3c4a6cd668ac80d60a03690e16aa6c4d292589 /phpBB/viewtopic.php | |
| parent | df9f35cce6a31e652fd2a4c403a86759319a2d24 (diff) | |
| parent | 74c3579693bac0c09bfd3bd9eded18cf57107c33 (diff) | |
| download | forums-1f6b9628e78f7a82eb2a3a455ef4a0448999dd68.tar forums-1f6b9628e78f7a82eb2a3a455ef4a0448999dd68.tar.gz forums-1f6b9628e78f7a82eb2a3a455ef4a0448999dd68.tar.bz2 forums-1f6b9628e78f7a82eb2a3a455ef4a0448999dd68.tar.xz forums-1f6b9628e78f7a82eb2a3a455ef4a0448999dd68.zip | |
Merge pull request #2852 from bantu/ticket/12938
[ticket/12938] Remove the 'Download all attachments' feature.
* bantu/ticket/12938:
[ticket/12938] Remove functional tests for 'Download all attachments'.
[ticket/12938] Remove the 'Download all attachments' feature.
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 50481302e6..8d7ab5323d 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1392,17 +1392,6 @@ if (sizeof($attach_list)) } } -$methods = phpbb_gen_download_links('topic_id', $topic_id, $phpbb_root_path, $phpEx); -foreach ($methods as $method) -{ - $template->assign_block_vars('dl_method', $method); -} - -$template->assign_vars(array( - 'S_HAS_ATTACHMENTS' => $topic_data['topic_attachment'], - 'U_DOWNLOAD_ALL_ATTACHMENTS' => $methods[0]['LINK'], -)); - // Instantiate BBCode if need be if ($bbcode_bitfield !== '') { @@ -1420,6 +1409,7 @@ $i_total = sizeof($rowset) - 1; $prev_post_id = ''; $template->assign_vars(array( + 'S_HAS_ATTACHMENTS' => $topic_data['topic_attachment'], 'S_NUM_POSTS' => sizeof($post_list)) ); @@ -1918,12 +1908,6 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) 'DISPLAY_ATTACHMENT' => $attachment) ); } - - $methods = phpbb_gen_download_links('post_id', $row['post_id'], $phpbb_root_path, $phpEx); - foreach ($methods as $method) - { - $template->assign_block_vars('postrow.dl_method', $method); - } } $current_row_number = $i; |