<!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>[14845] trunk/wp-admin: stripslashes()
the site name before passing to populate_network(), not in it.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14845">14845</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2010-05-24 19:18:30 +0000 (Mon, 24 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>stripslashes() the site name before passing to populate_network(), not in it. We should always expect unslashed data. reverts <a href="http://trac.wordpress.org/changeset/14754">[14754]</a>. fixes <a href="http://trac.wordpress.org/ticket/13448">#13448</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesschemaphp">trunk/wp-admin/includes/schema.php</a></li>
<li><a href="#trunkwpadminnetworkphp">trunk/wp-admin/network.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesschemaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/schema.php (14844 => 14845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/schema.php 2010-05-24 17:26:21 UTC (rev 14844)
+++ trunk/wp-admin/includes/schema.php 2010-05-24 19:18:30 UTC (rev 14845)
</span><span class="lines">@@ -689,7 +689,7 @@
</span><span class="cx"> --The Team @ SITE_NAME' );
</span><span class="cx">
</span><span class="cx"> $sitemeta = array(
</span><del>- 'site_name' => stripslashes($site_name),
</del><ins>+ 'site_name' => $site_name,
</ins><span class="cx"> 'admin_email' => $site_user->user_email,
</span><span class="cx"> 'admin_user_id' => $site_user->ID,
</span><span class="cx"> 'registration' => 'none',
</span></span></pre></div>
<a id="trunkwpadminnetworkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network.php (14844 => 14845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network.php 2010-05-24 17:26:21 UTC (rev 14844)
+++ trunk/wp-admin/network.php 2010-05-24 19:18:30 UTC (rev 14845)
</span><span class="lines">@@ -381,7 +381,7 @@
</span><span class="cx"> $hostname = get_clean_basedomain();
</span><span class="cx"> $subdomain_install = !allow_subdomain_install() ? false : (bool) $_POST['subdomain_install'];
</span><span class="cx"> if ( ! network_domain_check() ) {
</span><del>- $result = populate_network( 1, get_clean_basedomain(), sanitize_email( $_POST['email'] ), $_POST['sitename'], $base, $subdomain_install );
</del><ins>+ $result = populate_network( 1, get_clean_basedomain(), sanitize_email( $_POST['email'] ), stripslashes( $_POST['sitename'] ), $base, $subdomain_install );
</ins><span class="cx"> if ( is_wp_error( $result ) ) {
</span><span class="cx"> if ( 1 == count( $result->get_error_codes() ) && 'no_wildcard_dns' == $result->get_error_code() )
</span><span class="cx"> network_step2( $result );
</span></span></pre>
</div>
</div>
</body>
</html>