Ticket #42486: 42486.2.diff

src/wp-admin/includes/menu.php

@@ -185 +185 @@
 }
 unset( $id, $data, $subs, $first_sub );
 
+// Hide the tools page if it's going to be empty.
+$manage_taxonomies = false;
+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) ) {
+                $manage_taxonomies = true;
+                add_action( 'tool_box', 'tool_box_categories_tags_converter', 1 );
+        }
+}
+
+if ( ! isset( $submenu['tools.php'] ) && ! $manage_taxonomies && ! has_action( 'tool_box' ) ) {
+        foreach ( $menu as $i => $data ) {
+                if ( 'tools.php' == $data[2] ) {
+                        unset( $menu[ $i ] );
+                        break;
+                }
+        }
+        unset( $data );
+}
+
 /**
+ * Display the tool box card for the Categories and Tags Converter.
+ *
+ * @since 4.9.6
+ */
+function tool_box_categories_tags_converter() {
+        ?>
+        <div class="card">
+                <h2 class="title"><?php _e( 'Categories and Tags Converter' ) ?></h2>
+                <p><?php printf( __('If you want to convert your categories to tags (or vice versa), use the <a href="%s">Categories and Tags Converter</a> available from the Import screen.'), 'import.php' ); ?></p>
+        </div>
+        <?php
+}
+
+/**
  * @param string $add
  * @param string $class
  * @return string

src/wp-admin/tools.php

@@ -29 +29 @@
 ?>
 <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) ) : ?>
-<div class="card">
-        <h2 class="title"><?php _e( 'Categories and Tags Converter' ) ?></h2>
-        <p><?php printf( __('If you want to convert your categories to tags (or vice versa), use the <a href="%s">Categories and Tags Converter</a> available from the Import screen.'), 'import.php' ); ?></p>
-</div>
-<?php
-endif;
-endif;
 
-/**
- * Fires at the end of the Tools Administration screen.
- *
- * @since 2.8.0
- */
-do_action( 'tool_box' );
+<?php if ( ! has_action( 'tool_box' ) ) { ?>
+        <p><?php _e( 'Sorry, but there are no tools that you can access.' ); ?></p>
+        <?php
+} else {
+        /**
+         * Fires at the end of the Tools Administration screen.
+         *
+         * @since 2.8.0
+         */
+        do_action( 'tool_box' );
+}
 ?>
 </div>
 <?php