Ticket #22060: 22060.diff

wp-admin/edit-form-advanced.php

@@ -17 +17 @@
 
 if ( post_type_supports($post_type, 'editor') || post_type_supports($post_type, 'thumbnail') ) {
         add_thickbox();
-
-        wp_enqueue_script( 'media-upload' );
-        wp_enqueue_style( 'media-views' );
-        wp_plupload_default_settings();
-        add_action( 'admin_footer', 'wp_print_media_templates' );
 }
 
 /**

wp-admin/includes/media.php

@@ -381 +381 @@
         wp_enqueue_style( 'media-views' );
         wp_plupload_default_settings();
         add_action( 'admin_footer', 'wp_print_media_templates' );
+        add_action( 'wp_footer', 'wp_print_media_templates' );
 
         $context = apply_filters('media_buttons_context', __('Upload/Insert %s'));