WordPress.org

Make WordPress Core

Changeset 13545


Ignore:
Timestamp:
03/02/2010 10:31:06 AM (10 years ago)
Author:
dd32
Message:

Restore MultiSite checks on Upload settings, Add proper whitelisting. Props Denis-de-Bernardy. Fixes #11687

Location:
trunk/wp-admin
Files:
2 edited

Legend:

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

    r13529 r13545  
    9191</table>
    9292
     93<?php if ( !is_multisite() ) : ?>
    9394<h3><?php _e('Uploading Files'); ?></h3>
    9495<table class="form-table">
     
    118119<?php do_settings_fields('media', 'uploads'); ?>
    119120</table>
     121<?php endif; ?>
    120122
    121123<?php do_settings_sections('media'); ?>
  • trunk/wp-admin/options.php

    r13529 r13545  
    3636
    3737$mail_options = array('mailserver_url', 'mailserver_port', 'mailserver_login', 'mailserver_pass');
     38$uploads_options = array('uploads_use_yearmonth_folders', 'upload_path', 'upload_url_path');
    3839
    3940if ( !is_multisite() ) {
     
    4647    $whitelist_options['writing'] = array_merge($whitelist_options['writing'], $mail_options);
    4748    $whitelist_options['writing'][] = 'ping_sites';
     49
     50    $whitelist_options['media'] = array_merge($whitelist_options['media'], $uploads_options);
    4851} else {
    4952    $whitelist_options['general'][] = 'new_admin_email';
Note: See TracChangeset for help on using the changeset viewer.