diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php
index fb8f771f..d43ac601 100755
--- a/code/AssetAdmin.php
+++ b/code/AssetAdmin.php
@@ -120,6 +120,9 @@ JS
if(isset($data['ID']) && $data['ID'] != 'root') $folder = DataObject::get_by_id("Folder", $data['ID']);
else $folder = singleton('Folder');
+ // Don't modify the output of the template, or it will become invalid
+ ContentNegotiator::disable();
+
return array( 'CanUpload' => $folder->canEdit());
}
@@ -135,16 +138,11 @@ JS
new HiddenField("action_doUpload", "", "1"),
new FileField("Files[0]" , _t('AssetAdmin.CHOOSEFILE','Choose file: ')),
new LiteralField('UploadButton',"
-
+
"),
new LiteralField('MultifileCode',"
" . _t('AssetAdmin.FILESREADY','Files ready to upload:') ."
-
-
+
")
), new FieldSet(
));
diff --git a/templates/AssetAdmin_uploadiframe.ss b/templates/AssetAdmin_uploadiframe.ss
index 9827c384..71380543 100755
--- a/templates/AssetAdmin_uploadiframe.ss
+++ b/templates/AssetAdmin_uploadiframe.ss
@@ -1,26 +1,32 @@
-
-
-
-
-<% base_tag %>
-
-
-
-<% if CanUpload %>
-$UploadForm
-<% else %>
-<% _t('PERMFAILED','You do not have permission to upload files into this folder.') %>
-
-<% end_if %>
-
\ No newline at end of file
+
+
+
+ <% base_tag %>
+
+ <% _t('TITLE', 'Image Uploading Iframe') %>
+
+
+
+
+ <% if CanUpload %>
+ $UploadForm
+ <% else %>
+ <% _t('PERMFAILED','You do not have permission to upload files into this folder.') %>
+ <% end_if %>
+
+
+
\ No newline at end of file