From 4e6f054b47c1abec657bdf759fd4d623dcec32f2 Mon Sep 17 00:00:00 2001 From: ryan Date: Mon, 15 Jun 2009 00:22:53 +0000 Subject: [PATCH] Menu fixes git-svn-id: http://svn.automattic.com/wordpress/trunk@11565 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/plugin.php | 3 +++ wp-includes/plugin.php | 1 + 2 files changed, 4 insertions(+) diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php index 4f469c961..1cf6899e1 100644 --- a/wp-admin/includes/plugin.php +++ b/wp-admin/includes/plugin.php @@ -944,6 +944,9 @@ function user_can_access_admin_page() { return true; } + if ( isset( $plugin_page ) && ( $plugin_page == $parent ) && isset( $_wp_menu_nopriv[$plugin_page] ) ) + return false; + if ( isset( $submenu[$parent] ) ) { foreach ( $submenu[$parent] as $submenu_array ) { if ( isset( $plugin_page ) && ( $submenu_array[2] == $plugin_page ) ) { diff --git a/wp-includes/plugin.php b/wp-includes/plugin.php index 0588bc9ac..0e57784d8 100644 --- a/wp-includes/plugin.php +++ b/wp-includes/plugin.php @@ -495,6 +495,7 @@ function plugin_basename($file) { $mu_plugin_dir = str_replace('\\','/',WPMU_PLUGIN_DIR); // sanitize for Win32 installs $mu_plugin_dir = preg_replace('|/+|','/', $mu_plugin_dir); // remove any duplicate slash $file = preg_replace('#^' . preg_quote($plugin_dir, '#') . '/|^' . preg_quote($mu_plugin_dir, '#') . '/#','',$file); // get relative path from plugins dir + $file = trim($file, '/'); return $file; }