From 6045d8f79fbf2fa9650e62d1475b24a34d0f6541 Mon Sep 17 00:00:00 2001
From: Dion Hulse <dd32@git.wordpress.org>
Date: Tue, 2 Mar 2010 10:31:06 +0000
Subject: [PATCH] Restore MultiSite checks on Upload settings, Add proper
 whitelisting. Props Denis-de-Bernardy. Fixes #11687

git-svn-id: https://develop.svn.wordpress.org/trunk@13545 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/options-media.php | 2 ++
 wp-admin/options.php       | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/wp-admin/options-media.php b/wp-admin/options-media.php
index 184c7de5c9..38f24010cf 100644
--- a/wp-admin/options-media.php
+++ b/wp-admin/options-media.php
@@ -90,6 +90,7 @@ include('admin-header.php');
 <?php do_settings_fields('media', 'embeds'); ?>
 </table>
 
+<?php if ( !is_multisite() ) : ?>
 <h3><?php _e('Uploading Files'); ?></h3>
 <table class="form-table">
 <tr valign="top">
@@ -117,6 +118,7 @@ include('admin-header.php');
 
 <?php do_settings_fields('media', 'uploads'); ?>
 </table>
+<?php endif; ?>
 
 <?php do_settings_sections('media'); ?>
 
diff --git a/wp-admin/options.php b/wp-admin/options.php
index df56a43df7..6ec356f8e8 100644
--- a/wp-admin/options.php
+++ b/wp-admin/options.php
@@ -35,6 +35,7 @@ $whitelist_options = array(
 	'options' => array( '' ) );
 
 $mail_options = array('mailserver_url', 'mailserver_port', 'mailserver_login', 'mailserver_pass');
+$uploads_options = array('uploads_use_yearmonth_folders', 'upload_path', 'upload_url_path');
 
 if ( !is_multisite() ) {
 	if ( !defined( 'WP_SITEURL' ) ) $whitelist_options['general'][] = 'siteurl';
@@ -45,6 +46,8 @@ if ( !is_multisite() ) {
 
 	$whitelist_options['writing'] = array_merge($whitelist_options['writing'], $mail_options);
 	$whitelist_options['writing'][] = 'ping_sites';
+
+	$whitelist_options['media'] = array_merge($whitelist_options['media'], $uploads_options);
 } else {
 	$whitelist_options['general'][] = 'new_admin_email';
 	$whitelist_options['general'][] = 'WPLANG';