Ticket #20855: 20855.12.diff

wp-admin/js/common.js

@@ -395 +395 @@
                 if ( ! form.length )
                         return;
                 button = form.find('input[type="submit"]');
-                input = form.find('input[type="file"]');
+                input = button.prev('input[type="file"]');
+                if ( ! input.length )
+                        input = form.find('input[type="file"]');
                 function toggleUploadButton() {
                         button.prop('disabled', '' === input.val());
                 }

wp-admin/media-upload.php

@@ -87 +87 @@
 
         require_once('./admin-header.php');
 
-        $form_class = 'media-upload-form type-form validate';
+        $form_class = 'media-upload-form wp-upload-form type-form validate';
 
         if ( get_user_setting('uploader') )
                 $form_class .= ' html-uploader';