From f7a1b199dbf181344e36a1952044331b8d91937e Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Sat, 15 Sep 2007 21:57:11 +0000
Subject: [PATCH] elofgren: BUGFIX: Fix issue with deleting pictures with 'X'
 delete link not removing thumbs in _resampled folder. Thanks to Mateusz for
 reporting this. (merged from branches/gsoc)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41964 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/AssetAdmin.php                   | 4 ++++
 templates/Includes/AssetTableField.ss | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php
index 430c0c0b..f07315d7 100755
--- a/code/AssetAdmin.php
+++ b/code/AssetAdmin.php
@@ -628,6 +628,10 @@ if(!$record)
 	public function removefile(){
 		if($fileID = $this->urlParams['ID']){
 			$file = DataObject::get_by_id('File', $fileID);
+			// Delete the temp verions of this file in assets/_resampled
+			if($file instanceof Image) {
+				$file->deleteFormattedImages();
+			}
 			$file->delete();
 			$file->destroy();
 			
diff --git a/templates/Includes/AssetTableField.ss b/templates/Includes/AssetTableField.ss
index a66af1ab..61cece37 100755
--- a/templates/Includes/AssetTableField.ss
+++ b/templates/Includes/AssetTableField.ss
@@ -23,7 +23,7 @@
 					</td>
 					<% if Can(delete) %>
 					<td width="18">
-						<a class="deletelink" href="$DeleteLink" title="Delete this file"><img src="cms/images/delete.gif" alt="delete" /></a>
+						<a class="deletelink" href="admin/assets/removefile/$ID" title="Delete this file"><img src="cms/images/delete.gif" alt="delete" /></a>
 					</td>
 					<% end_if %>
 				</tr>