Ticket #29520: 29520.patch

src/wp-admin/js/media.js

@@ -72 +72 @@
         };
 
         $( document ).ready( function() {
+                var $mediaGridWrap = $( '#wp-media-grid' );
+
                 // Open up a manage media frame into the grid.
-                wp.media && wp.media({
-                        frame: 'manage',
-                        container: $('#wpbody-content > .wrap')
-                }).open();
+                if ( $mediaGridWrap.length && window.wp && window.wp.media ) {
+                        window.wp.media({
+                                frame: 'manage',
+                                container: $mediaGridWrap
+                        }).open();
+                }
 
                 $( '#find-posts-submit' ).click( function( event ) {
                         if ( ! $( '#find-posts-response input[type="radio"]:checked' ).length )

src/wp-admin/upload.php

@@ -57 +57 @@
 
         require_once( ABSPATH . 'wp-admin/admin-header.php' );
         ?>
-        <div class="wrap">
+        <div class="wrap" id="wp-media-grid">
                 <h2>
                 <?php
                 echo esc_html( $title );