[wp-cvs] wordpress/wp-admin admin-functions.php,1.60,1.61

[Ryan Boren]

Update of /cvsroot/cafelog/wordpress/wp-admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27347/wp-admin

Modified Files:
	admin-functions.php 
Log Message:
Submenu construction improvement.

Index: admin-functions.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/admin-functions.php,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** admin-functions.php	3 Dec 2004 02:38:10 -0000	1.60
--- admin-functions.php	4 Dec 2004 05:02:07 -0000	1.61
***************
*** 745,751 ****
--- 745,765 ----
  function add_submenu_page($parent, $page_title, $menu_title, $access_level, $file) {
  	global $submenu;
+ 	global $menu;
  
+ 	$parent = plugin_basename($parent);
  	$file = plugin_basename($file);
  
+ 	// If the parent doesn't already have a submenu, add a link to the parent
+ 	// as the first item in the submenu.  If the submenu file is the same as the
+ 	// parent file someone is trying to link back to the parent manually.  In
+ 	// this case, don't automatically add a link back to avoid duplication.
+ 	if (! isset($submenu[$parent]) && $file != $parent) {
+ 		foreach ($menu as $parent_menu) {
+ 			if ($parent_menu[2] == $parent) {
+ 				$submenu[$parent][] = $parent_menu;
+ 			}
+ 		}
+ 	}
+ 	
  	$submenu[$parent][] = array($menu_title, $access_level, $file, $page_title);
  }