Changeset 2381

Timestamp:

02/25/2005 04:11:27 PM (21 years ago)

Author:

ryan

Message:

Add callback API to add_menu_page(). Fix some menu bugs. ​http://mosquito.wordpress.org/view.php?id=975 Reviewed by Owen.

Location:

trunk/wp-admin

Files:

• admin-functions.php (modified) (6 diffs)
• menu-header.php (modified) (1 diff)

trunk/wp-admin/admin-functions.php

@@ -745 +745 @@
 function get_admin_page_parent() {
         global $parent_file;
+        global $menu;
         global $submenu;
         global $pagenow;
@@ -753 +754 @@
         }
 
+        if ($pagenow == 'admin.php' && isset($plugin_page)) {
+                foreach ($menu as $parent_menu) {
+                        if ($parent_menu[2] == $plugin_page) {
+                                $parent_file = $plugin_page;
+                                return $plugin_page;
+                        }
+                }
+        }
+                
         foreach (array_keys($submenu) as $parent) {
                 foreach ($submenu[$parent] as $submenu_array) {
@@ -770 +780 @@
 
 function plugin_basename($file) {
-        return preg_replace('#^.*wp-content/plugins/#', '', $file);
-}
-
-function add_menu_page($page_title, $menu_title, $access_level, $file) {
+        return preg_replace('/^.*wp-content[\\\\\/]plugins[\\\\\/]/', '', $file);
+}
+
+function add_menu_page($page_title, $menu_title, $access_level, $file, $function = '') {
         global $menu, $admin_page_hooks;
 
@@ -781 +791 @@
 
         $admin_page_hooks[$file] = sanitize_title($menu_title);
+
+        $hookname = get_plugin_page_hookname($file, '');
+        if ( !empty($function) && !empty($hookname) )
+                add_action($hookname, $function);
+
+        return $hookname;
 }
 
@@ -1015 +1031 @@
         global $admin_page_hooks;
 
-        if ( isset($admin_page_hooks[$parent_page]) )
+        $parent = get_admin_page_parent();
+
+        if ( empty($parent_page) || 'admin.php' == $parent_page ) {
+                if ( isset($admin_page_hooks[$plugin_page]) )
+                        $page_type = 'toplevel';
+                else if ( isset($admin_page_hooks[$parent]) )
+                        $page_type = $admin_page_hooks[$parent];
+        } else if ( isset($admin_page_hooks[$parent_page]) ) {
                 $page_type = $admin_page_hooks[$parent_page];
-        else
+        } else {
                 $page_type = 'admin';
+        }
 
         $plugin_name = preg_replace('!\.php!', '', $plugin_page);
@@ -1027 +1051 @@
 function get_plugin_page_hook($plugin_page, $parent_page) {
         global $wp_filter;
-
+        
         $hook = get_plugin_page_hookname($plugin_page, $parent_page);
-
         if ( isset($wp_filter[$hook]) )
                 return $hook;

trunk/wp-admin/menu-header.php

@@ -40 +40 @@
 else $class = '';
 
-if (file_exists(ABSPATH . "wp-content/plugins/{$item[2]}")) {
-        $menu_hook = get_plugin_page_hook($item[2], $parent_file);
-        if ( $menu_hook )
-                echo "\n\t<li><a href='" . get_settings('siteurl') . "/wp-admin/{$parent_file}?page={$item[2]}'$class>{$item[0]}</a></li>";             
+$menu_hook = get_plugin_page_hook($item[2], $parent_file);
+
+if (file_exists(ABSPATH . "wp-content/plugins/{$item[2]}") || ! empty($menu_hook)) {
+        if ( 'admin.php' == $pagenow )
+                echo "\n\t<li><a href='" . get_settings('siteurl') . "/wp-admin/admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";
         else
-                echo "\n\t<li><a href='" . get_settings('siteurl') . "/wp-admin/admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";
+                echo "\n\t<li><a href='" . get_settings('siteurl') . "/wp-admin/{$parent_file}?page={$item[2]}'$class>{$item[0]}</a></li>";
  } else {
         echo "\n\t<li><a href='" . get_settings('siteurl') . "/wp-admin/{$item[2]}'$class>{$item[0]}</a></li>";