[wp-cvs] wordpress/wp-admin menu-header.php, 1.2, 1.3 menu.php, 1.35, 1.36

[Matthew Mullenweg]

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

Modified Files:
	menu-header.php menu.php 
Log Message:
Only check once, good idea: http://mosquito.wordpress.org/view.php?id=371

Index: menu.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/menu.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** menu.php	8 Dec 2004 22:32:49 -0000	1.35
--- menu.php	14 Dec 2004 09:53:16 -0000	1.36
***************
*** 13,17 ****
  $menu[35] = array(__('Plugins'), 8, 'plugins.php');
  $menu[40] = array(__('Presentation'), 8, 'themes.php');
! $menu[45] = array(__('Upload'), get_settings('fileupload_minlevel'), 'upload.php');
  
  $submenu['post.php'][5] = array(__('Write Post'), 1, 'post.php');
--- 13,18 ----
  $menu[35] = array(__('Plugins'), 8, 'plugins.php');
  $menu[40] = array(__('Presentation'), 8, 'themes.php');
! if ( get_option('use_fileupload') )
! 	$menu[45] = array(__('Upload'), get_settings('fileupload_minlevel'), 'upload.php');
  
  $submenu['post.php'][5] = array(__('Write Post'), 1, 'post.php');

Index: menu-header.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/menu-header.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** menu-header.php	26 Nov 2004 01:50:37 -0000	1.2
--- menu-header.php	14 Dec 2004 09:53:16 -0000	1.3
***************
*** 13,26 ****
      
  	if ($user_level >= $item[1]) {
! 		if (
! 				('upload.php' == $item[2] && 
! 				 get_settings('use_fileupload') && 
! 				 ($user_level >= get_settings('fileupload_minlevel'))
! 				 ) || 'upload.php' != $item[2]) {
! 			if (file_exists(ABSPATH . "wp-content/plugins/{$item[2]}"))
! 				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/{$item[2]}'$class>{$item[0]}</a></li>";
! 		}
  	}
  }
--- 13,20 ----
      
  	if ($user_level >= $item[1]) {
! 		if ( file_exists(ABSPATH . "wp-content/plugins/{$item[2]}") )
! 			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/{$item[2]}'$class>{$item[0]}</a></li>";
  	}
  }