Ticket #21413: 21413.diff

wp-admin/admin-header.php

@@ -100 +100 @@
 </script>
 
 <?php
-// If the customize-loader script is enqueued, make sure the customize
-// body classes are correct as early as possible.
-if ( wp_script_is( 'customize-loader', 'queue' ) && current_user_can( 'edit_theme_options' ) )
+// Make sure the customize body classes are correct as early as possible.
+if (  current_user_can( 'edit_theme_options' ) )
         wp_customize_support_script();
 ?>
 

wp-admin/menu.php

@@ -129 +129 @@
 
 $menu[59] = array( '', 'read', 'separator2', '', 'wp-menu-separator' );
 
-if ( current_user_can( 'switch_themes') ) {
-        $menu[60] = array( __('Appearance'), 'switch_themes', 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'div' );
-                $submenu['themes.php'][5]  = array(__('Themes'), 'switch_themes', 'themes.php');
-                if ( current_theme_supports( 'menus' ) || current_theme_supports( 'widgets' ) )
-                        $submenu['themes.php'][10] = array(__('Menus'), 'edit_theme_options', 'nav-menus.php');
-} else {
-        $menu[60] = array( __('Appearance'), 'edit_theme_options', 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'div' );
-                $submenu['themes.php'][5]  = array(__('Themes'), 'edit_theme_options', 'themes.php');
-                if ( current_theme_supports( 'menus' ) || current_theme_supports( 'widgets' ) )
-                        $submenu['themes.php'][10] = array(__('Menus'), 'edit_theme_options', 'nav-menus.php' );
-}
+$appearance_cap = current_user_can( 'switch_themes') ? 'switch_themes' : 'edit_theme_options';
+
+$menu[60] = array( __('Appearance'), $appearance_cap, 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'div' );
+        $submenu['themes.php'][4] = array( __( 'Customize' ), $appearance_cap, 'customize.php', 'hide-if-no-customize' ); 
+        $submenu['themes.php'][5] = array(__('Themes'), $appearance_cap, 'themes.php');
+        if ( current_theme_supports( 'menus' ) || current_theme_supports( 'widgets' ) )
+                $submenu['themes.php'][10] = array(__('Menus'), 'edit_theme_options', 'nav-menus.php');
+
+unset( $appearance_cap );
 
 // Add 'Editor' to the bottom of the Appearance menu.
 if ( ! is_multisite() )

wp-admin/menu-header.php

@@ -53 +53 @@
                         $class[] = 'wp-has-submenu';
                         $submenu_items = $submenu[$item[2]];
                 }
-
+                
                 if ( ( $parent_file && $item[2] == $parent_file ) || ( empty($typenow) && $self == $item[2] ) ) {
                         $class[] = ! empty( $submenu_items ) ? 'wp-has-current-submenu wp-menu-open' : 'current';
                 } else {
@@ -80 +80 @@
                 if ( false !== strpos( $class, 'wp-menu-separator' ) ) {
                         echo '<div class="separator"></div>';
                 } elseif ( $submenu_as_parent && ! empty( $submenu_items ) ) {
-                        $submenu_items = array_values( $submenu_items );  // Re-index.
+                        $temp_submenu_items = $submenu_items = array_values( $submenu_items );  // Re-index.
+                        if ( 'customize.php' == $submenu_items[0][2] )
+                                $submenu_items[0][2] = 'themes.php';
                         $menu_hook = get_plugin_page_hook( $submenu_items[0][2], $item[2] );
                         $menu_file = $submenu_items[0][2];
                         if ( false !== ( $pos = strpos( $menu_file, '?' ) ) )
@@ -91 +93 @@
                         } else {
                                 echo "\n\t<div class='wp-menu-image'><a href='{$submenu_items[0][2]}' tabindex='-1' aria-label='$aria_label'>$img</a></div>$arrow<a href='{$submenu_items[0][2]}'$class $aria_attributes>$title</a>";
                         }
+                        $submenu_items = $temp_submenu_items;
                 } elseif ( ! empty( $item[2] ) && current_user_can( $item[1] ) ) {
                         $menu_hook = get_plugin_page_hook( $item[2], 'admin.php' );
                         $menu_file = $item[2];
@@ -103 +106 @@
                                 echo "\n\t<div class='wp-menu-image'><a href='{$item[2]}' tabindex='-1' aria-label='$aria_label'>$img</a></div>$arrow<a href='{$item[2]}'$class $aria_attributes>{$item[0]}</a>";
                         }
                 }
-
+                
                 if ( ! empty( $submenu_items ) ) {
                         echo "\n\t<div class='wp-submenu'><div class='wp-submenu-wrap'>";
                         echo "<div class='wp-submenu-head'>{$item[0]}</div><ul>";
@@ -137 +140 @@
                                 ) {
                                         $class[] = 'current';
                                 }
+                                
+                                if ( ! empty( $sub_item[3] ) )
+                                        $class[] = $sub_item[3];
 
                                 $class = $class ? ' class="' . join( ' ', $class ) . '"' : '';
 

wp-admin/includes/menu.php

@@ -73 +73 @@
         $new_parent = $first_sub[2];
         // If the first submenu is not the same as the assigned parent,
         // make the first submenu the new parent.
-        if ( $new_parent != $old_parent ) {
+        if ( $new_parent != $old_parent && 'customize.php' != $new_parent ) {
                 $_wp_real_parent_file[$old_parent] = $new_parent;
                 $menu[$id][2] = $new_parent;