From 90637984b6ab6fee9e9d75211c3c1acd41c90640 Mon Sep 17 00:00:00 2001
From: dd32 <dd32@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Mon, 1 Mar 2010 12:13:15 +0000
Subject: [PATCH] Move Upload folder settings to Options -> Media. Props nacin.
 Fixes #11687

git-svn-id: http://svn.automattic.com/wordpress/trunk@13529 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/options-media.php | 28 ++++++++++++++++++++++++++
 wp-admin/options-misc.php  | 40 ++++++--------------------------------
 wp-admin/options.php       |  4 ++--
 3 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/wp-admin/options-media.php b/wp-admin/options-media.php
index abe72bc5e..184c7de5c 100644
--- a/wp-admin/options-media.php
+++ b/wp-admin/options-media.php
@@ -90,6 +90,34 @@ include('admin-header.php');
 <?php do_settings_fields('media', 'embeds'); ?>
 </table>
 
+<h3><?php _e('Uploading Files'); ?></h3>
+<table class="form-table">
+<tr valign="top">
+<th scope="row"><label for="upload_path"><?php _e('Store uploads in this folder'); ?></label></th>
+<td><input name="upload_path" type="text" id="upload_path" value="<?php echo esc_attr(get_option('upload_path')); ?>" class="regular-text code" />
+<span class="description"><?php _e('Default is <code>wp-content/uploads</code>'); ?></span>
+</td>
+</tr>
+
+<tr valign="top">
+<th scope="row"><label for="upload_url_path"><?php _e('Full URL path to files'); ?></label></th>
+<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" />
+<span class="description"><?php _e('Configuring this is optional. By default, it should be blank.'); ?></span>
+</td>
+</tr>
+
+<tr>
+<th scope="row" colspan="2" class="th-full">
+<label for="uploads_use_yearmonth_folders">
+<input name="uploads_use_yearmonth_folders" type="checkbox" id="uploads_use_yearmonth_folders" value="1"<?php checked('1', get_option('uploads_use_yearmonth_folders')); ?> />
+<?php _e('Organize my uploads into month- and year-based folders'); ?>
+</label>
+</th>
+</tr>
+
+<?php do_settings_fields('media', 'uploads'); ?>
+</table>
+
 <?php do_settings_sections('media'); ?>
 
 <p class="submit">
diff --git a/wp-admin/options-misc.php b/wp-admin/options-misc.php
index 8dcdd4e48..6ef74ffee 100644
--- a/wp-admin/options-misc.php
+++ b/wp-admin/options-misc.php
@@ -25,47 +25,19 @@ include('admin-header.php');
 
 <form method="post" action="options.php">
 <?php settings_fields('misc'); ?>
-<?php if ( !is_multisite() ) { ?>
-<h3><?php _e('Uploading Files'); ?></h3>
+
 <table class="form-table">
-<tr valign="top">
-<th scope="row"><label for="upload_path"><?php _e('Store uploads in this folder'); ?></label></th>
-<td><input name="upload_path" type="text" id="upload_path" value="<?php echo esc_attr(get_option('upload_path')); ?>" class="regular-text code" />
-<span class="description"><?php _e('Default is <code>wp-content/uploads</code>'); ?></span>
-</td>
-</tr>
-
-<tr valign="top">
-<th scope="row"><label for="upload_url_path"><?php _e('Full URL path to files'); ?></label></th>
-<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" />
-<span class="description"><?php _e('Configuring this is optional. By default, it should be blank.'); ?></span>
-</td>
-</tr>
-
 <tr>
-<th scope="row" colspan="2" class="th-full">
-<label for="uploads_use_yearmonth_folders">
-<input name="uploads_use_yearmonth_folders" type="checkbox" id="uploads_use_yearmonth_folders" value="1"<?php checked('1', get_option('uploads_use_yearmonth_folders')); ?> />
-<?php _e('Organize my uploads into month- and year-based folders'); ?>
+<th scope="row" class="th-full">
+<label for="use_linksupdate">
+<input name="use_linksupdate" type="checkbox" id="use_linksupdate" value="1"<?php checked('1', get_option('use_linksupdate')); ?> />
+<?php _e('Track links&#8217; update times') ?>
 </label>
 </th>
 </tr>
 <?php do_settings_fields('misc', 'default'); ?>
 </table>
 
-<table class="form-table">
-
-<tr>
-<th scope="row" class="th-full">
-<label for="use_linksupdate">
-<input name="use_linksupdate" type="checkbox" id="use_linksupdate" value="1"<?php checked('1', get_option('use_linksupdate')); ?> />
-<?php _e('Track Links&#8217; Update Times') ?>
-</label>
-</th>
-</tr>
-
-</table>
-<?php } ?>
 <?php do_settings_sections('misc'); ?>
 
 <p class="submit">
@@ -75,4 +47,4 @@ include('admin-header.php');
 </form>
 </div>
 
-<?php include('./admin-footer.php'); ?>
+<?php include('./admin-footer.php'); ?>
\ No newline at end of file
diff --git a/wp-admin/options.php b/wp-admin/options.php
index 0152737ed..df56a43df 100644
--- a/wp-admin/options.php
+++ b/wp-admin/options.php
@@ -27,8 +27,8 @@ wp_reset_vars(array('action'));
 $whitelist_options = array(
 	'general' => array( 'blogname', 'blogdescription', 'gmt_offset', 'date_format', 'time_format', 'start_of_week', 'timezone_string' ),
 	'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' ),
-	'misc' => array( 'use_linksupdate', 'uploads_use_yearmonth_folders', 'upload_path', 'upload_url_path' ),
-	'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' ),
+	'misc' => array( 'use_linksupdate' ),
+	'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' ),
 	'privacy' => array( 'blog_public' ),
 	'reading' => array( 'posts_per_page', 'posts_per_rss', 'rss_use_excerpt', 'blog_charset', 'show_on_front', 'page_on_front', 'page_for_posts' ),
 	'writing' => array( 'default_post_edit_rows', 'use_smilies', 'default_category', 'default_email_category', 'use_balanceTags', 'default_link_category', 'enable_app', 'enable_xmlrpc' ),