WordPress.org

Make WordPress Core

Changeset 23137


Ignore:
Timestamp:
12/09/12 18:02:16 (16 months 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:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/3.5

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

    r21998 r23137  
    1818$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>'; 
    1919 
    20 if ( ! is_multisite() ) { 
     20if ( ! is_multisite() && ( get_option('upload_url_path') || ( get_option('upload_path') != 'wp-content/uploads' && get_option('upload_path') ) ) ) { 
    2121    $media_options_help .= '<p>' . __('Uploading Files allows you to choose the folder and path for storing your uploaded files.') . '</p>'; 
    2222} 
Note: See TracChangeset for help on using the changeset viewer.