Changes in trunk/wp-admin/menu-header.php [15866:18349]
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-admin/menu-header.php
r15866 r18349 37 37 global $self, $parent_file, $submenu_file, $plugin_page, $pagenow, $typenow; 38 38 39 $menu_setting_increment = -1; 40 $user_settings = get_all_user_settings(); 41 39 42 $first = true; 40 43 // 0 = name, 1 = capability, 2 = file, 3 = class, 4 = id, 5 = icon src … … 46 49 $first = false; 47 50 } 48 if ( !empty($submenu[$item[2]]) ) 51 if ( !empty($submenu[$item[2]]) ) { 49 52 $class[] = 'wp-has-submenu'; 53 $menu_setting_increment++; 54 } 50 55 51 56 if ( ( $parent_file && $item[2] == $parent_file ) || ( empty($typenow) && $self == $item[2] ) ) { … … 54 59 else 55 60 $class[] = 'current'; 61 } elseif ( ! empty( $submenu[ $item[2] ] ) && isset( $user_settings[ 'm' . $menu_setting_increment ] ) && 'o' == $user_settings[ 'm' . $menu_setting_increment ] ) { 62 $class[] = 'wp-menu-open'; 56 63 } 57 64 … … 70 77 } 71 78 $toggle = '<div class="wp-menu-toggle"><br /></div>'; 79 $arrow = '<div class="wp-menu-arrow"><div></div></div>'; 72 80 73 81 $title = wptexturize($item[0]); … … 75 83 echo "\n\t<li$class$id>"; 76 84 77 if ( false !== strpos( $class, 'wp-menu-separator') ) {78 echo '< a class="separator" href="?unfoldmenu=1"><br /></a>';85 if ( false !== strpos( $class, 'wp-menu-separator' ) ) { 86 echo '<div class="separator"></div>'; 79 87 } elseif ( $submenu_as_parent && !empty($submenu[$item[2]]) ) { 80 88 $submenu[$item[2]] = array_values($submenu[$item[2]]); // Re-index. … … 85 93 if ( ( ('index.php' != $submenu[$item[2]][0][2]) && file_exists(WP_PLUGIN_DIR . "/$menu_file") ) || !empty($menu_hook)) { 86 94 $admin_is_parent = true; 87 echo "<div class='wp-menu-image'><a href='admin.php?page={$submenu[$item[2]][0][2]}'>$img</a></div>$ toggle<a href='admin.php?page={$submenu[$item[2]][0][2]}'$class$tabindex>$title</a>";95 echo "<div class='wp-menu-image'><a href='admin.php?page={$submenu[$item[2]][0][2]}'>$img</a></div>$arrow$toggle<a href='admin.php?page={$submenu[$item[2]][0][2]}'$class$tabindex>$title</a>"; 88 96 } else { 89 echo "\n\t<div class='wp-menu-image'><a href='{$submenu[$item[2]][0][2]}'>$img</a></div>$ toggle<a href='{$submenu[$item[2]][0][2]}'$class$tabindex>$title</a>";97 echo "\n\t<div class='wp-menu-image'><a href='{$submenu[$item[2]][0][2]}'>$img</a></div>$arrow$toggle<a href='{$submenu[$item[2]][0][2]}'$class$tabindex>$title</a>"; 90 98 } 91 } else if ( current_user_can($item[1]) ) {99 } else if ( !empty($item[2]) && current_user_can($item[1]) ) { 92 100 $menu_hook = get_plugin_page_hook($item[2], 'admin.php'); 93 101 $menu_file = $item[2]; … … 96 104 if ( ('index.php' != $item[2]) && file_exists(WP_PLUGIN_DIR . "/$menu_file") || !empty($menu_hook) ) { 97 105 $admin_is_parent = true; 98 echo "\n\t<div class='wp-menu-image'><a href='admin.php?page={$item[2]}'>$img</a></div>$ toggle<a href='admin.php?page={$item[2]}'$class$tabindex>{$item[0]}</a>";106 echo "\n\t<div class='wp-menu-image'><a href='admin.php?page={$item[2]}'>$img</a></div>$arrow$toggle<a href='admin.php?page={$item[2]}'$class$tabindex>{$item[0]}</a>"; 99 107 } else { 100 echo "\n\t<div class='wp-menu-image'><a href='{$item[2]}'>$img</a></div>$ toggle<a href='{$item[2]}'$class$tabindex>{$item[0]}</a>";108 echo "\n\t<div class='wp-menu-image'><a href='{$item[2]}'>$img</a></div>$arrow$toggle<a href='{$item[2]}'$class$tabindex>{$item[0]}</a>"; 101 109 } 102 110 } 103 111 104 112 if ( !empty($submenu[$item[2]]) ) { 105 echo "\n\t<div class='wp-submenu'><div class='wp-submenu-head'>{$item[0]}</div><ul>"; 113 echo "\n\t<div class='wp-submenu'><div class='wp-submenu-wrap'>"; 114 echo "<div class='wp-submenu-head'>{$item[0]}</div><ul>"; 106 115 $first = true; 107 116 foreach ( $submenu[$item[2]] as $sub_key => $sub_item ) { … … 156 165 } 157 166 } 158 echo "</ul></div> ";167 echo "</ul></div></div>"; 159 168 } 160 169 echo "</li>"; 161 170 } 171 172 echo '<li id="collapse-menu" class="hide-if-no-js"><div id="collapse-button"><div></div></div>'; 173 echo '<span>' . esc_html__( 'Collapse menu' ) . '</span>'; 174 echo '</li>'; 162 175 } 163 176 164 177 ?> 165 178 179 <div id="adminmenuback"></div> 180 <div id="adminmenuwrap"> 181 <div id="adminmenushadow"></div> 166 182 <ul id="adminmenu"> 167 183 … … 173 189 ?> 174 190 </ul> 191 </div>
Note: See TracChangeset
for help on using the changeset viewer.