Changes from trunk/wp-admin/includes/plugin.php at r11450 to branches/2.8/wp-admin/includes/plugin.php at r11629

File:

• branches/2.8/wp-admin/includes/plugin.php (modified) (10 diffs)

branches/2.8/wp-admin/includes/plugin.php

@@ -586 +586 @@
 
 function add_menu_page( $page_title, $menu_title, $access_level, $file, $function = '', $icon_url = '' ) {
-        global $menu, $admin_page_hooks;
+        global $menu, $admin_page_hooks, $_registered_pages;
 
         $file = plugin_basename( $file );
@@ -603 +603 @@
         $menu[] = array ( $menu_title, $access_level, $file, $page_title, 'menu-top ' . $hookname, $hookname, $icon_url );
 
+        $_registered_pages[$hookname] = true;
+
         return $hookname;
 }
 
 function add_object_page( $page_title, $menu_title, $access_level, $file, $function = '', $icon_url = '') {
-        global $menu, $admin_page_hooks, $_wp_last_object_menu;
+        global $menu, $admin_page_hooks, $_wp_last_object_menu, $_registered_pages;
 
         $file = plugin_basename( $file );
@@ -624 +626 @@
         $menu[$_wp_last_object_menu] = array ( $menu_title, $access_level, $file, $page_title, 'menu-top ' . $hookname, $hookname, $icon_url );
 
+        $_registered_pages[$hookname] = true;
+
         return $hookname;
 }
 
 function add_utility_page( $page_title, $menu_title, $access_level, $file, $function = '', $icon_url = '') {
-        global $menu, $admin_page_hooks, $_wp_last_utility_menu;
+        global $menu, $admin_page_hooks, $_wp_last_utility_menu, $_registered_pages;
 
         $file = plugin_basename( $file );
@@ -646 +650 @@
 
         $menu[$_wp_last_utility_menu] = array ( $menu_title, $access_level, $file, $page_title, 'menu-top ' . $hookname, $hookname, $icon_url );
+
+        $_registered_pages[$hookname] = true;
 
         return $hookname;
@@ -655 +661 @@
         global $_wp_real_parent_file;
         global $_wp_submenu_nopriv;
+        global $_registered_pages;
 
         $file = plugin_basename( $file );
@@ -683 +690 @@
         if (!empty ( $function ) && !empty ( $hookname ))
                 add_action( $hookname, $function );
+
+        $_registered_pages[$hookname] = true;
+        // backwards-compatibility for plugins using add_management page.  See wp-admin/admin.php for redirect from edit.php to tools.php
+        if ( 'tools.php' == $parent ) 
+                $_registered_pages[get_plugin_page_hookname( $file, 'edit.php')] = true;
 
         return $hookname;
@@ -920 +932 @@
         global $_wp_submenu_nopriv;
         global $plugin_page;
+        global $_registered_pages;
 
         $parent = get_admin_page_parent();
@@ -926 +939 @@
                 return false;
 
-        if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$parent][$plugin_page] ) )
-                return false;
+        if ( isset( $plugin_page ) ) {
+                if ( isset( $_wp_submenu_nopriv[$parent][$plugin_page] ) )
+                        return false;
+
+                $hookname = get_plugin_page_hookname($plugin_page, $parent);
+                if ( !isset($_registered_pages[$hookname]) )
+                        return false;
+        }
 
         if ( empty( $parent) ) {
@@ -936 +955 @@
                 if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$pagenow][$plugin_page] ) )
                         return false;
+                if ( isset( $plugin_page ) && isset( $_wp_menu_nopriv[$plugin_page] ) )
+                        return false;
                 foreach (array_keys( $_wp_submenu_nopriv ) as $key ) {
                         if ( isset( $_wp_submenu_nopriv[$key][$pagenow] ) )
@@ -944 +965 @@
                 return true;
         }
+
+        if ( isset( $plugin_page ) && ( $plugin_page == $parent ) && isset( $_wp_menu_nopriv[$plugin_page] ) )
+                return false;
 
         if ( isset( $submenu[$parent] ) ) {