summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--wp-admin/upload-functions.php2
-rw-r--r--wp-admin/upload-js.php3
2 files changed, 3 insertions, 2 deletions
diff --git a/wp-admin/upload-functions.php b/wp-admin/upload-functions.php
index 00bccf7..19aad31 100644
--- a/wp-admin/upload-functions.php
+++ b/wp-admin/upload-functions.php
@@ -76,7 +76,7 @@ function wp_upload_view() {
</div>
<?php the_attachment_links( $id ); ?>
</div>
-<?php
+<?php echo "<form action='' id='browse-form'><input type='hidden' id='nonce-value' value='" . wp_create_nonce( 'inlineuploading' ) . "' /></form>\n";
}
function wp_upload_form() {
diff --git a/wp-admin/upload-js.php b/wp-admin/upload-js.php
index c7b27aa..423ea3b 100644
--- a/wp-admin/upload-js.php
+++ b/wp-admin/upload-js.php
@@ -223,7 +223,8 @@ addLoadEvent( function() {
win.tinyMCE.execCommand('mceInsertContent', false, h);
else
win.edInsertContent(win.edCanvas, h);
- this.cancelView();
+ if ( !this.ID )
+ this.cancelView();
return false;
},