WordPress.org

Make WordPress Core

Changeset 13529


Ignore:
Timestamp:
03/01/2010 12:13:15 PM (9 years ago)
Author:
dd32
Message:

Move Upload folder settings to Options -> Media. Props nacin. Fixes #11687

Location:
trunk/wp-admin
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/options-media.php

    r12411 r13529  
    9191</table>
    9292
     93<h3><?php _e('Uploading Files'); ?></h3>
     94<table class="form-table">
     95<tr valign="top">
     96<th scope="row"><label for="upload_path"><?php _e('Store uploads in this folder'); ?></label></th>
     97<td><input name="upload_path" type="text" id="upload_path" value="<?php echo esc_attr(get_option('upload_path')); ?>" class="regular-text code" />
     98<span class="description"><?php _e('Default is <code>wp-content/uploads</code>'); ?></span>
     99</td>
     100</tr>
     101
     102<tr valign="top">
     103<th scope="row"><label for="upload_url_path"><?php _e('Full URL path to files'); ?></label></th>
     104<td><input name="upload_url_path" type="text" id="upload_url_path" value="<?php echo esc_attr( get_option('upload_url_path')); ?>" class="regular-text code" />
     105<span class="description"><?php _e('Configuring this is optional. By default, it should be blank.'); ?></span>
     106</td>
     107</tr>
     108
     109<tr>
     110<th scope="row" colspan="2" class="th-full">
     111<label for="uploads_use_yearmonth_folders">
     112<input name="uploads_use_yearmonth_folders" type="checkbox" id="uploads_use_yearmonth_folders" value="1"<?php checked('1', get_option('uploads_use_yearmonth_folders')); ?> />
     113<?php _e('Organize my uploads into month- and year-based folders'); ?>
     114</label>
     115</th>
     116</tr>
     117
     118<?php do_settings_fields('media', 'uploads'); ?>
     119</table>
     120
    93121<?php do_settings_sections('media'); ?>
    94122
  • trunk/wp-admin/options-misc.php

    r12712 r13529  
    2626<form method="post" action="options.php">
    2727<?php settings_fields('misc'); ?>
    28 <?php if ( !is_multisite() ) { ?>
    29 <h3><?php _e('Uploading Files'); ?></h3>
     28
    3029<table class="form-table">
    31 <tr valign="top">
    32 <th scope="row"><label for="upload_path"><?php _e('Store uploads in this folder'); ?></label></th>
    33 <td><input name="upload_path" type="text" id="upload_path" value="<?php echo esc_attr(get_option('upload_path')); ?>" class="regular-text code" />
    34 <span class="description"><?php _e('Default is <code>wp-content/uploads</code>'); ?></span>
    35 </td>
    36 </tr>
    37 
    38 <tr valign="top">
    39 <th scope="row"><label for="upload_url_path"><?php _e('Full URL path to files'); ?></label></th>
    40 <td><input name="upload_url_path" type="text" id="upload_url_path" value="<?php echo esc_attr( get_option('upload_url_path')); ?>" class="regular-text code" />
    41 <span class="description"><?php _e('Configuring this is optional. By default, it should be blank.'); ?></span>
    42 </td>
    43 </tr>
    44 
    4530<tr>
    46 <th scope="row" colspan="2" class="th-full">
    47 <label for="uploads_use_yearmonth_folders">
    48 <input name="uploads_use_yearmonth_folders" type="checkbox" id="uploads_use_yearmonth_folders" value="1"<?php checked('1', get_option('uploads_use_yearmonth_folders')); ?> />
    49 <?php _e('Organize my uploads into month- and year-based folders'); ?>
     31<th scope="row" class="th-full">
     32<label for="use_linksupdate">
     33<input name="use_linksupdate" type="checkbox" id="use_linksupdate" value="1"<?php checked('1', get_option('use_linksupdate')); ?> />
     34<?php _e('Track links&#8217; update times') ?>
    5035</label>
    5136</th>
     
    5439</table>
    5540
    56 <table class="form-table">
    57 
    58 <tr>
    59 <th scope="row" class="th-full">
    60 <label for="use_linksupdate">
    61 <input name="use_linksupdate" type="checkbox" id="use_linksupdate" value="1"<?php checked('1', get_option('use_linksupdate')); ?> />
    62 <?php _e('Track Links&#8217; Update Times') ?>
    63 </label>
    64 </th>
    65 </tr>
    66 
    67 </table>
    68 <?php } ?>
    6941<?php do_settings_sections('misc'); ?>
    7042
  • trunk/wp-admin/options.php

    r13472 r13529  
    2828    'general' => array( 'blogname', 'blogdescription', 'gmt_offset', 'date_format', 'time_format', 'start_of_week', 'timezone_string' ),
    2929    'discussion' => array( 'default_pingback_flag', 'default_ping_status', 'default_comment_status', 'comments_notify', 'moderation_notify', 'comment_moderation', 'require_name_email', 'comment_whitelist', 'comment_max_links', 'moderation_keys', 'blacklist_keys', 'show_avatars', 'avatar_rating', 'avatar_default', 'close_comments_for_old_posts', 'close_comments_days_old', 'thread_comments', 'thread_comments_depth', 'page_comments', 'comments_per_page', 'default_comments_page', 'comment_order', 'comment_registration' ),
    30     'misc' => array( 'use_linksupdate', 'uploads_use_yearmonth_folders', 'upload_path', 'upload_url_path' ),
    31     'media' => array( 'thumbnail_size_w', 'thumbnail_size_h', 'thumbnail_crop', 'medium_size_w', 'medium_size_h', 'large_size_w', 'large_size_h', 'image_default_size', 'image_default_align', 'image_default_link_type', 'embed_autourls', 'embed_size_w', 'embed_size_h' ),
     30    'misc' => array( 'use_linksupdate' ),
     31    'media' => array( 'thumbnail_size_w', 'thumbnail_size_h', 'thumbnail_crop', 'medium_size_w', 'medium_size_h', 'large_size_w', 'large_size_h', 'image_default_size', 'image_default_align', 'image_default_link_type', 'embed_autourls', 'embed_size_w', 'embed_size_h', 'uploads_use_yearmonth_folders', 'upload_path', 'upload_url_path' ),
    3232    'privacy' => array( 'blog_public' ),
    3333    'reading' => array( 'posts_per_page', 'posts_per_rss', 'rss_use_excerpt', 'blog_charset', 'show_on_front', 'page_on_front', 'page_for_posts' ),
Note: See TracChangeset for help on using the changeset viewer.