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;