Ticket #51190: 51190.diff

src/wp-admin/includes/template.php

@@ -1697 +1697 @@
         }
 }
 
+/**
+ * Check whether a particular settings section has settings fields.
+ *
+ * @global array $wp_settings_fields Storage array of settings fields and their pages/sections.
+ *
+ * @since 5.6.0
+ *
+ * @param string $page Slug title of the admin page whose settings fields you want to check.
+ * @param string $section Slug title of the settings section whose fields you want to check.
+ * @return bool True if the settings section has settings fields. False otherwise.
+ */
+function has_settings_fields( $page, $section ) {
+        global $wp_settings_fields;
+
+        return isset( $wp_settings_fields[ $page ][ $section ] ) && $wp_settings_fields[ $page ][ $section ];
+}
+
 /**
  * Print out the settings fields for a particular settings section.
  *

src/wp-admin/options-media.php

@@ -13 +13 @@
         wp_die( __( 'Sorry, you are not allowed to manage options for this site.' ) );
 }
 
-$title       = __( 'Media Settings' );
-$parent_file = 'options-general.php';
+$title                = __( 'Media Settings' );
+$parent_file          = 'options-general.php';
+$can_edit_uploads_dir = false;
 
 $media_options_help = '<p>' . __( 'You can set maximum sizes for images inserted into your written content; you can also insert an image as Full Size.' ) . '</p>';
 
@@ -107 +108 @@
 <h2 class="title"><?php _e( 'Uploading Files' ); ?></h2>
 <table class="form-table" role="presentation">
         <?php
+        $can_edit_uploads_dir = get_option( 'upload_url_path' ) || ( get_option( 'upload_path' ) !== 'wp-content/uploads' && get_option( 'upload_path' ) );
         /*
          * If upload_url_path is not the default (empty),
          * or upload_path is not the default ('wp-content/uploads' or empty),
          * they can be edited, otherwise they're locked.
          */
-        if ( get_option( 'upload_url_path' ) || ( get_option( 'upload_path' ) != 'wp-content/uploads' && get_option( 'upload_path' ) ) ) :
+        if ( $can_edit_uploads_dir ) :
                 ?>
 <tr>
 <th scope="row"><label for="upload_path"><?php _e( 'Store uploads in this folder' ); ?></label></th>
@@ -132 +134 @@
 <p class="description"><?php _e( 'Configuring this is optional. By default, it should be blank.' ); ?></p>
 </td>
 </tr>
+<?php endif; ?>
+
+<?php if ( $can_edit_uploads_dir || has_settings_fields( 'media', 'uploads' ) ) : ?>
 <tr>
 <td colspan="2" class="td-full">
 <?php else : ?>