Changeset 21852

Timestamp:

09/14/2012 09:00:39 PM (11 years ago)

Author:

nacin

Message:

Hide upload_path and upload_url_path from the Media Settings screen, assuming they are both set to their default values.

These can be set on options.php, or the UPLOADS constant or the filters in wp_upload_dir() should be used. WordPress should aim to avoid UI options that require filesystem changes as well, not to mention requiring the user to convert between paths and URLs.

fixes #21720.

Location:

trunk/wp-admin

Files:

• options-media.php (modified) (2 diffs)
• options.php (modified) (2 diffs)

trunk/wp-admin/options-media.php

@@ -122 +122 @@
 <h3><?php _e('Uploading Files'); ?></h3>
 <table class="form-table">
+<?php
+// If upload_url_path is not the default (empty), and upload_path is not the default ('wp-content/uploads' or empty)
+if ( get_option('upload_url_path') || ( get_option('upload_path') != 'wp-content/uploads' && get_option('upload_path') ) ) :
+?>
 <tr valign="top">
 <th scope="row"><label for="upload_path"><?php _e('Store uploads in this folder'); ?></label></th>
@@ -135 +139 @@
 </td>
 </tr>
-
+<?php endif; ?>
 <tr>
 <th scope="row" colspan="2" class="th-full">

trunk/wp-admin/options.php

@@ -69 +69 @@
 
 $mail_options = array('mailserver_url', 'mailserver_port', 'mailserver_login', 'mailserver_pass');
-$uploads_options = array('uploads_use_yearmonth_folders', 'upload_path', 'upload_url_path');
 
 if ( ! in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) )
@@ -87 +86 @@
     $whitelist_options['writing'][] = 'ping_sites';
 
-    $whitelist_options['media'] = array_merge($whitelist_options['media'], $uploads_options);
+    $whitelist_options['media'][] = 'uploads_use_yearmonth_folders';
+
+    // If upload_url_path and upload_path are both default values, 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';
+        $whitelist_options['media'][] = 'upload_url_path';
+    }
 } else {
     $whitelist_options['general'][] = 'new_admin_email';