Changeset 13579

Timestamp:

03/04/2010 12:15:55 AM (15 years ago)

Author:

ryan

Message:

Fix submenus for post types. Props TobiasBg. see #12453

Location:

trunk/wp-admin

Files:

• admin.php (modified) (4 diffs)
• includes/plugin.php (modified) (5 diffs)
• includes/template.php (modified) (1 diff)
• menu-header.php (modified) (5 diffs)
• menu.php (modified) (2 diffs)

trunk/wp-admin/admin.php

@@ -73 +73 @@
 $editing = false;
 
-if (isset($_GET['page'])) {
+if ( isset($_GET['page']) ) {
     $plugin_page = stripslashes($_GET['page']);
     $plugin_page = plugin_basename($plugin_page);
 }
+
+if ( isset($_GET['post_type']) )
+    $typenow = sanitize_user($_GET['post_type'], true);
+else
+    $typenow = '';
 
 require(ABSPATH . 'wp-admin/menu.php');
@@ -82 +87 @@
 do_action('admin_init');
 
-if (isset($plugin_page) ) {
-    if ( ! $page_hook = get_plugin_page_hook($plugin_page, $pagenow) ) {
+if ( isset($plugin_page) ) {
+    if ( !empty($typenow) )
+        $the_parent = $pagenow . '?post_type=' . $typenow;
+    else
+        $the_parent = $pagenow;
+    if ( ! $page_hook = get_plugin_page_hook($plugin_page, $the_parent) ) {
         $page_hook = get_plugin_page_hook($plugin_page, $plugin_page);
         // backwards compatibility for plugins using add_management_page
@@ -96 +105 @@
         }
     }
+    unset($the_parent);
 }
 
@@ -105 +115 @@
 else if ( isset($pagenow) )
     $hook_suffix = $pagenow;
-
-if ( isset($_GET['post_type']) )
-    $typenow = $_GET['post_type'];
-else
-    $typenow = '';
-// @todo validate typenow against post types.
 
 set_current_screen();

trunk/wp-admin/includes/plugin.php

@@ -818 +818 @@
 
     $hookname = get_plugin_page_hookname( $menu_slug, '' );
+
     if (!empty ( $function ) && !empty ( $hookname ) && current_user_can( $capability ) )
         add_action( $hookname, $function );
@@ -1168 +1169 @@
     global $submenu;
     global $pagenow;
+    global $typenow;
     global $plugin_page;
     global $_wp_real_parent_file;
@@ -1216 +1218 @@
             if ( isset( $_wp_real_parent_file[$parent] ) )
                 $parent = $_wp_real_parent_file[$parent];
-            if ( $submenu_array[2] == $pagenow && ( empty($parent_file) || false === strpos($parent_file, '?') ) ) {
+            if ( !empty($typenow) && ($submenu_array[2] == "$pagenow?post_type=$typenow") ) {
+                $parent_file = $parent;
+                return $parent;
+            } elseif ( $submenu_array[2] == $pagenow && empty($typenow) && ( empty($parent_file) || false === strpos($parent_file, '?') ) ) {
                 $parent_file = $parent;
                 return $parent;
@@ -1327 +1332 @@
     }
 
+
     $plugin_name = preg_replace( '!\.php!', '', $plugin_page );
 
@@ -1351 +1357 @@
 
         $hookname = get_plugin_page_hookname($plugin_page, $parent);
+
         if ( !isset($_registered_pages[$hookname]) )
             return false;

trunk/wp-admin/includes/template.php

@@ -3948 +3948 @@
         $current_screen->id = $typenow;
         $current_screen->post_type = $typenow;
-    } else {
-        $typenow = '';
     }
 

trunk/wp-admin/menu-header.php

@@ -34 +34 @@
  */
 function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
-    global $self, $parent_file, $submenu_file, $plugin_page, $pagenow;
+    global $self, $parent_file, $submenu_file, $plugin_page, $pagenow, $typenow;
 
     $first = true;
@@ -48 +48 @@
             $class[] = 'wp-has-submenu';
 
-        if ( ( $parent_file && $item[2] == $parent_file ) || ( false === strpos($parent_file, '?') && strcmp($self, $item[2]) == 0 ) ) {
+        if ( ( $parent_file && $item[2] == $parent_file ) || ( false === strpos($parent_file, '?') && $self == $item[2] ) ) {
             if ( !empty($submenu[$item[2]]) )
                 $class[] = 'wp-has-current-submenu wp-menu-open';
@@ -113 +113 @@
 
                 $menu_file = $item[2];
+
                 if ( false !== $pos = strpos($menu_file, '?') )
                     $menu_file = substr($menu_file, 0, $pos);
+
+                // Handle current for post_type=post|page|foo pages, which won't match $self.
+                if ( !empty($typenow) )
+                    $self_type = $self . '?post_type=' . $typenow;
+                else
+                    $self_type = 'nothing';
 
                 if ( isset($submenu_file) ) {
@@ -121 +128 @@
                 // If plugin_page is set the parent must either match the current page or not physically exist.
                 // This allows plugin pages with the same hook to exist under different parents.
-                } else if ( (isset($plugin_page) && $plugin_page == $sub_item[2] && (!file_exists($menu_file) || ($item[2] == $self))) || (!isset($plugin_page) && $self == $sub_item[2]) ) {
+                } else if ( (isset($plugin_page) && $plugin_page == $sub_item[2] && (!file_exists($menu_file) || ($item[2] == $self) || ($item[2] == $self_type))) || (!isset($plugin_page) && $self == $sub_item[2]) ) {
                     $class[] = 'current';
                 }
@@ -134 +141 @@
                 if ( ( ('index.php' != $sub_item[2]) && file_exists(WP_PLUGIN_DIR . "/$sub_file") ) || ! empty($menu_hook) ) {
                     // If admin.php is the current page or if the parent exists as a file in the plugins or admin dir
-
-                    $parent_exists = (!$admin_is_parent && file_exists(WP_PLUGIN_DIR . "/$menu_file") && !is_dir(WP_PLUGIN_DIR . "/{$item[2]}") ) || file_exists($menu_file);
-                    if ( $parent_exists )
-                        echo "<li$class><a href='{$item[2]}?page={$sub_item[2]}'$class$tabindex>{$sub_item[0]}</a></li>";
-                    elseif ( 'admin.php' == $pagenow || !$parent_exists )
-                        echo "<li$class><a href='admin.php?page={$sub_item[2]}'$class$tabindex>{$sub_item[0]}</a></li>";
+                    if ( (!$admin_is_parent && file_exists(WP_PLUGIN_DIR . "/$menu_file") && !is_dir(WP_PLUGIN_DIR . "/{$item[2]}")) || file_exists($menu_file) )
+                        $sub_item_url = add_query_arg( array('page' => $sub_item[2]), $item[2] );
                     else
-                        echo "<li$class><a href='{$item[2]}?page={$sub_item[2]}'$class$tabindex>{$sub_item[0]}</a></li>";
+                        $sub_item_url = add_query_arg( array('page' => $sub_item[2]), 'admin.php' );
+                    echo "<li$class><a href='$sub_item_url'$class$tabindex>{$sub_item[0]}</a></li>";
                 } else {
                     echo "<li$class><a href='{$sub_item[2]}'$class$tabindex>{$sub_item[0]}</a></li>";

trunk/wp-admin/menu.php

@@ -178 +178 @@
 // Create list of page plugin hook names.
 foreach ($menu as $menu_page) {
-    $hook_name = sanitize_title(basename($menu_page[2], '.php'));
+    if ( false !== $pos = strpos($menu_page[2], '?') ) {
+        // Handle post_type=post|page|foo pages.
+        $hook_name = substr($menu_page[2], 0, $pos);
+        $hook_args = substr($menu_page[2], $pos + 1);
+        wp_parse_str($hook_args, $hook_args);
+        // Set the hook name to be the post type.
+        if ( isset($hook_args['post_type']) )
+            $hook_name = $hook_args['post_type'];
+        else
+            $hook_name = basename($hook_name, '.php');
+        unset($hook_args);
+    } else {
+        $hook_name = basename($menu_page[2], '.php');
+    }
+    $hook_name = sanitize_title($hook_name);
 
     // ensure we're backwards compatible
@@ -184 +198 @@
         'index' => 'dashboard',
         'edit' => 'posts',
+        'post' => 'posts',
         'upload' => 'media',
         'link-manager' => 'links',
         'edit-pages' => 'pages',
+        'page' => 'pages',
         'edit-comments' => 'comments',
         'options-general' => 'settings',