Changeset 11566

Timestamp:

06/15/2009 12:23:13 AM (17 years ago)

Author:

ryan

Message:

Menu fixes

Location:

branches/2.8

Files:

• wp-admin/includes/plugin.php (modified) (1 diff)
• wp-includes/plugin.php (modified) (1 diff)

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

@@ -945 +945 @@
     }
 
+    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 ) {

branches/2.8/wp-includes/plugin.php

@@ -496 +496 @@
     $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;
 }