From f5be047b97b108641feaa32cfca20dc72866f8dc Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Wed, 31 Mar 2010 05:00:02 +0000
Subject: [PATCH] BUGFIX Stop IE6/IE7 from redirecting in admin/assets after
 deleting multiple folders (fixes #5208)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101969 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/AssetAdmin.php      | 5 +++--
 javascript/AssetAdmin.js | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php
index ac6d687b..eb8bcee2 100755
--- a/code/AssetAdmin.php
+++ b/code/AssetAdmin.php
@@ -650,7 +650,8 @@ JS;
 		}
 		
 		$script .= "statusMessage('$message');";
-		echo $script;
+
+		return $script;
 	}
 	
 	public function removefile(){
@@ -662,7 +663,7 @@ JS;
 			}
 			$file->delete();
 			$file->destroy();
-			
+
 			if(Director::is_ajax()) {
 				echo <<<JS
 				$('Form_EditForm_Files').removeFile($fileID);
diff --git a/javascript/AssetAdmin.js b/javascript/AssetAdmin.js
index 5b910d9d..4aecd46a 100755
--- a/javascript/AssetAdmin.js
+++ b/javascript/AssetAdmin.js
@@ -432,7 +432,7 @@ var deletefolder = {
 					errorMessage('Error deleting pages', response);
 				}
 			});
-
+			
 			$('deletepage').getElementsByTagName('button')[0].onclick();
 			
 		} else {
@@ -506,7 +506,8 @@ appendLoader(function () {
 				onsubmit: function(event) {
 					deletefolder.form_submit();
 					Event.stop(event);
-					}
+					return false;
+				}
 				}
 			});
 		Element.hide('Form_DeleteItemsForm');