From c2de88f893241f24538203715fa54cea35ffd79a Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Mon, 5 Jan 2009 01:41:32 +0000
Subject: [PATCH] BUGFIX Fixed js error due to inlined inclusion of
 CMSMain_upload.js which was conflicting with inline initialization. Disabled
 initializiation as the flash uploader was pulled out a while ago anyway (see
 #3251)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@69657 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/AssetAdmin.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php
index ef7798d7..4183f435 100755
--- a/code/AssetAdmin.php
+++ b/code/AssetAdmin.php
@@ -135,7 +135,8 @@ JS
 	 * Return the form object shown in the uploadiframe.
 	 */
 	function UploadForm() {
-
+		// disabled flash upload javascript (CMSMain_upload()) below,
+		// see r54952 (originally committed in r42014)
 		$form = new Form($this,'UploadForm', new FieldSet(
 			new HiddenField("ID", "", $this->currentPageID()),
 			// needed because the button-action is triggered outside the iframe
@@ -150,7 +151,7 @@ JS
 				<script>
 					var multi_selector = new MultiSelector($('Form_UploadForm_FilesList'), null, $('Form_UploadForm_action_upload'));
 					multi_selector.addElement($('Form_UploadForm_Files-0'));
-                    new window.top.document.CMSMain_upload();
+                    //new window.top.document.CMSMain_upload();
 				</script>
 			")
 		), new FieldSet(