<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[13545] trunk/wp-admin: Restore MultiSite checks on Upload settings,
Add proper whitelisting.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13545">13545</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-03-02 10:31:06 +0000 (Tue, 02 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Restore MultiSite checks on Upload settings, Add proper whitelisting. Props Denis-de-Bernardy. Fixes <a href="http://trac.wordpress.org/ticket/11687">#11687</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminoptionsmediaphp">trunk/wp-admin/options-media.php</a></li>
<li><a href="#trunkwpadminoptionsphp">trunk/wp-admin/options.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminoptionsmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-media.php (13544 => 13545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-media.php 2010-03-02 03:59:28 UTC (rev 13544)
+++ trunk/wp-admin/options-media.php 2010-03-02 10:31:06 UTC (rev 13545)
</span><span class="lines">@@ -90,6 +90,7 @@
</span><span class="cx"> <?php do_settings_fields('media', 'embeds'); ?>
</span><span class="cx"> </table>
</span><span class="cx">
</span><ins>+<?php if ( !is_multisite() ) : ?>
</ins><span class="cx"> <h3><?php _e('Uploading Files'); ?></h3>
</span><span class="cx"> <table class="form-table">
</span><span class="cx"> <tr valign="top">
</span><span class="lines">@@ -117,6 +118,7 @@
</span><span class="cx">
</span><span class="cx"> <?php do_settings_fields('media', 'uploads'); ?>
</span><span class="cx"> </table>
</span><ins>+<?php endif; ?>
</ins><span class="cx">
</span><span class="cx"> <?php do_settings_sections('media'); ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options.php (13544 => 13545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options.php 2010-03-02 03:59:28 UTC (rev 13544)
+++ trunk/wp-admin/options.php 2010-03-02 10:31:06 UTC (rev 13545)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> 'options' => array( '' ) );
</span><span class="cx">
</span><span class="cx"> $mail_options = array('mailserver_url', 'mailserver_port', 'mailserver_login', 'mailserver_pass');
</span><ins>+$uploads_options = array('uploads_use_yearmonth_folders', 'upload_path', 'upload_url_path');
</ins><span class="cx">
</span><span class="cx"> if ( !is_multisite() ) {
</span><span class="cx"> if ( !defined( 'WP_SITEURL' ) ) $whitelist_options['general'][] = 'siteurl';
</span><span class="lines">@@ -45,6 +46,8 @@
</span><span class="cx">
</span><span class="cx"> $whitelist_options['writing'] = array_merge($whitelist_options['writing'], $mail_options);
</span><span class="cx"> $whitelist_options['writing'][] = 'ping_sites';
</span><ins>+
+ $whitelist_options['media'] = array_merge($whitelist_options['media'], $uploads_options);
</ins><span class="cx"> } else {
</span><span class="cx"> $whitelist_options['general'][] = 'new_admin_email';
</span><span class="cx"> $whitelist_options['general'][] = 'WPLANG';
</span></span></pre>
</div>
</div>
</body>
</html>