Ticket #25457: 25457.diff

wp-admin/admin-header.php

@@ -55 +55 @@
 wp_enqueue_script('utils');
 wp_enqueue_script( 'svg-painter' );
 
+if ( current_user_can( 'edit_theme_options' ) ) {
+        wp_enqueue_script( 'customize-loader' );
+}
+
 $admin_body_class = preg_replace('/[^a-z0-9_-]+/i', '-', $hook_suffix);
 ?>
 <script type="text/javascript">

wp-admin/menu-header.php

@@ -139 +139 @@
                                 if ( ! current_user_can( $sub_item[1] ) )
                                         continue;
 
-                                $class = array();
+                                $class = explode( ' ', $sub_item[3] );
+                                // @todo: esc_attr each item
                                 if ( $first ) {
                                         $class[] = 'wp-first-item';
                                         $first = false;

wp-admin/menu.php

@@ -146 +146 @@
 
 $menu[60] = array( __('Appearance'), $appearance_cap, 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'dashicons-admin-appearance' );
         $submenu['themes.php'][5] = array( __( 'Themes' ), $appearance_cap, 'themes.php' );
-        $submenu['themes.php'][6] = array( __( 'Customize' ), 'edit_theme_options', 'customize.php', 'hide-if-no-customize' );
+        $submenu['themes.php'][6] = array( __( 'Customize' ), 'edit_theme_options', 'customize.php', 'hide-if-no-customize load-customize' );
         if ( current_theme_supports( 'menus' ) || current_theme_supports( 'widgets' ) )
                 $submenu['themes.php'][10] = array(__( 'Menus' ), 'edit_theme_options', 'nav-menus.php');
 

wp-includes/js/customize-loader.js

@@ -26 +26 @@
                         this.bind( 'open', this.overlay.show );
                         this.bind( 'close', this.overlay.hide );
 
-                        $('#wpbody').on( 'click', '.load-customize', function( event ) {
+                        $('#wpwrap').on( 'click', '.load-customize', function( event ) {
                                 event.preventDefault();
 
                                 // Store a reference to the link that opened the customizer.