Ticket #42486: 42486.patch

src/wp-admin/menu.php

@@ -240 +240 @@
         }
 }
 
-$menu[75] = array( __('Tools'), 'edit_posts', 'tools.php', '', 'menu-top menu-icon-tools', 'menu-tools', 'dashicons-admin-tools' );
-        $submenu['tools.php'][5] = array( __('Available Tools'), 'edit_posts', 'tools.php' );
-        $submenu['tools.php'][10] = array( __('Import'), 'import', 'import.php' );
-        $submenu['tools.php'][15] = array( __('Export'), 'export', 'export.php' );
-        if ( is_multisite() && !is_main_site() )
-                $submenu['tools.php'][25] = array( __('Delete Site'), 'delete_site', 'ms-delete-site.php' );
-        if ( ! is_multisite() && defined('WP_ALLOW_MULTISITE') && WP_ALLOW_MULTISITE )
-                $submenu['tools.php'][50] = array(__('Network Setup'), 'setup_network', 'network.php');
+if ( current_user_can( 'import' ) ) {
+        $menu[75]                 = array( __( 'Tools' ), 'edit_posts', 'tools.php', '', 'menu-top menu-icon-tools', 'menu-tools', 'dashicons-admin-tools' );
+        $submenu['tools.php'][5]  = array( __( 'Available Tools' ), 'edit_posts', 'tools.php' );
+        $submenu['tools.php'][10] = array( __( 'Import' ), 'import', 'import.php' );
+        $submenu['tools.php'][15] = array( __( 'Export' ), 'export', 'export.php' );
+        if ( is_multisite() && ! is_main_site() ) {
+                $submenu['tools.php'][25] = array( __( 'Delete Site' ), 'delete_site', 'ms-delete-site.php' );
+        }
+        if ( ! is_multisite() && defined( 'WP_ALLOW_MULTISITE' ) && WP_ALLOW_MULTISITE ) {
+                $submenu['tools.php'][50] = array( __( 'Network Setup' ), 'setup_network', 'network.php' );
+        }
+}
 
 $menu[80] = array( __('Settings'), 'manage_options', 'options-general.php', '', 'menu-top menu-icon-settings', 'menu-settings', 'dashicons-admin-settings' );
         $submenu['options-general.php'][10] = array(_x('General', 'settings screen'), 'manage_options', 'options-general.php');

src/wp-admin/tools.php

@@ -9 +9 @@
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
+if ( ! current_user_can('import') )
+        wp_die( __( 'Sorry, you are not allowed to access this page.' ) );
+
 $title = __('Tools');
 
 get_current_screen()->add_help_tab( array(
@@ -30 +33 @@
 <div class="wrap">
 <h1><?php echo esc_html( $title ); ?></h1>
 <?php
-if ( current_user_can( 'import' ) ) :
 $cats = get_taxonomy('category');
 $tags = get_taxonomy('post_tag');
 if ( current_user_can($cats->cap->manage_terms) || current_user_can($tags->cap->manage_terms) ) : ?>
@@ -40 +42 @@
 </div>
 <?php
 endif;
-endif;
 
 /**
  * Fires at the end of the Tools Administration screen.