WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Merges [23134] to the 3.5 branch.



git-svn-id: http://core.svn.wordpress.org/branches/3.5@23137 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2012-12-09 18:02:16 +00:00
parent 438bf33ba9 60be66457a
commit 54bead8783
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/options-media.php
View File

@ -17,7 +17,7 @@ $parent_file = 'options-general.php';
$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>';
}