Ticket #11687: 11687.3.diff

wp-admin/options-media.php

@@ -90 +90 @@
 <?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 +118 @@
 
 <?php do_settings_fields('media', 'uploads'); ?>
 </table>
+<?php endif; ?>
 
 <?php do_settings_sections('media'); ?>
 

wp-admin/options.php

@@ -35 +35 @@
         '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 +46 @@
 
         $whitelist_options['writing'] = array_merge($whitelist_options['writing'], $mail_options);
         $whitelist_options['writing'][] = 'ping_sites';
+        
+        $whiltelist_options['media'] = array_merge($whiltelist_options['media'], $uploads_options);
 } else {
         $whitelist_options['general'][] = 'new_admin_email';
         $whitelist_options['general'][] = 'WPLANG';