Changeset 23137

Timestamp:

12/09/2012 06:02:16 PM (12 years ago)

Author:

nacin

Message:

Only show help for upload_path and upload_url_path if those fields are visible. fixes #21720.

Merges [23134] to the 3.5 branch.

Location:

branches/3.5

Files:

• . (modified) (1 prop)
• wp-admin/options-media.php (modified) (1 diff)

branches/3.5/wp-admin/options-media.php

@@ -18 +18 @@
 $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>';
 
-if ( ! is_multisite() ) {
+if ( ! is_multisite() && ( get_option('upload_url_path') || ( get_option('upload_path') != 'wp-content/uploads' && get_option('upload_path') ) ) ) {
     $media_options_help .= '<p>' . __('Uploading Files allows you to choose the folder and path for storing your uploaded files.') . '</p>';
 }