diff options
author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-10-05 18:07:11 +0000 |
---|---|---|
committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-10-05 18:07:11 +0000 |
commit | 6e038c5171a02fc6920d376ba49d14fadbb8a5e0 (patch) | |
tree | 6cbf943ed9ff58cebce851a2701d5e5bcbfaac90 /wp-admin | |
parent | f3e1495bb5cf5771152ebd818a33b1e2ac6aef98 (diff) | |
download | wordpress-mu-6e038c5171a02fc6920d376ba49d14fadbb8a5e0.tar.gz wordpress-mu-6e038c5171a02fc6920d376ba49d14fadbb8a5e0.tar.xz wordpress-mu-6e038c5171a02fc6920d376ba49d14fadbb8a5e0.zip |
Upload fixes
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@792 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin')
-rw-r--r-- | wp-admin/upload-functions.php | 2 | ||||
-rw-r--r-- | wp-admin/upload-js.php | 3 |
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; }, |