Ticket #25618: 25618.2.patch

src/wp-includes/class-wp-customize-manager.php

@@ -28 +28 @@
          * @since 3.4.0
          */
         public function __construct() {
-                require( ABSPATH . WPINC . '/class-wp-customize-setting.php' );
-                require( ABSPATH . WPINC . '/class-wp-customize-section.php' );
-                require( ABSPATH . WPINC . '/class-wp-customize-control.php' );
+                require_once( ABSPATH . WPINC . '/class-wp-customize-setting.php' );
+                require_once( ABSPATH . WPINC . '/class-wp-customize-section.php' );
+                require_once( ABSPATH . WPINC . '/class-wp-customize-control.php' );
 
                 add_filter( 'wp_die_handler', array( $this, 'wp_die_handler' ) );
 

src/wp-includes/css/media-views.css

@@ -98 +98 @@
         z-index: 160000;
 }
 
+.wp-customizer .media-modal {
+        z-index: 560000;
+}
+
 .media-modal-backdrop {
         position: fixed;
         top: 0;
@@ -110 +114 @@
         z-index: 159900;
 }
 
+.wp-customizer .media-modal-backdrop {
+        z-index: 559900;
+}
+
 .media-modal-close {
         position: absolute;
         text-decoration: none;

src/wp-includes/media.php

@@ -1942 +1942 @@
         require_once ABSPATH . WPINC . '/media-template.php';
         add_action( 'admin_footer', 'wp_print_media_templates' );
         add_action( 'wp_footer', 'wp_print_media_templates' );
+        add_action( 'customize_controls_print_footer_scripts', 'wp_print_media_templates' );
 
         do_action( 'wp_enqueue_media' );
 }