Changeset 47874

Timestamp:

06/01/2020 11:20:16 AM (5 years ago)

Author:

SergeyBiryukov

Message:

Docs: Correct and clarify an inline comment about the upload_url_path and upload_path options in wp-admin/options-media.php.

Synchronize it with a similar comment in wp-admin/options.php.

See #49572.

Location:

trunk/src/wp-admin

Files:

• options-media.php (modified) (1 diff)
• options.php (modified) (1 diff)

trunk/src/wp-admin/options-media.php

@@ -108 +108 @@
 <table class="form-table" role="presentation">
     <?php
-    // If upload_url_path is not the default (empty), and upload_path is not the default ('wp-content/uploads' or empty).
+    /*
+     * 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' ) ) ) :
         ?>

trunk/src/wp-admin/options.php

@@ -178 +178 @@
     $whitelist_options['media'][] = 'uploads_use_yearmonth_folders';
 
-    // If upload_url_path and upload_path are both default values, they're locked.
+    /*
+     * 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' ) ) ) {
         $whitelist_options['media'][] = 'upload_path';