Merge pull request phpbb#5242 from rubencm/ticket/15688

[ticket/15688] Fix event location in attachments download
usermonk · Jun 29, 2018 · 1491ce8 · 1491ce8
2 parents 7266e69 + 8896018
commit 1491ce8
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/phpBB/download/file.php b/phpBB/download/file.php
@@ -266,6 +266,16 @@
 		$display_cat = ATTACHMENT_CATEGORY_NONE;
 	}
 
+	if ($thumbnail)
+	{
+		$attachment['physical_filename'] = 'thumb_' . $attachment['physical_filename'];
+	}
+	else if ($display_cat == ATTACHMENT_CATEGORY_NONE && !$attachment['is_orphan'] && !phpbb_http_byte_range($attachment['filesize']))
+	{
+		// Update download count
+		phpbb_increment_downloads($db, $attachment['attach_id']);
+	}
+
 	$redirect = '';
 
 	/**
@@ -294,16 +304,6 @@
 	);
 	extract($phpbb_dispatcher->trigger_event('core.download_file_send_to_browser_before', compact($vars)));
 
-	if ($thumbnail)
-	{
-		$attachment['physical_filename'] = 'thumb_' . $attachment['physical_filename'];
-	}
-	else if ($display_cat == ATTACHMENT_CATEGORY_NONE && !$attachment['is_orphan'] && !phpbb_http_byte_range($attachment['filesize']))
-	{
-		// Update download count
-		phpbb_increment_downloads($db, $attachment['attach_id']);
-	}
-
 	if ($display_cat == ATTACHMENT_CATEGORY_IMAGE && $mode === 'view' && (strpos($attachment['mimetype'], 'image') === 0) && (strpos(strtolower($user->browser), 'msie') !== false) && !phpbb_is_greater_ie_version($user->browser, 7))
 	{
 		wrap_img_in_html(append_sid($phpbb_root_path . 'download/file.' . $phpEx, 'id=' . $attachment['attach_id']), $attachment['real_filename']);