<!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>[16306] trunk/wp-admin/network: Whitespace cleanup.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16306">16306</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-11-11 16:57:22 +0000 (Thu, 11 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Whitespace cleanup. Props sorich87. see <a href="http://trac.wordpress.org/ticket/14147">#14147</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminnetworksiteinfophp">trunk/wp-admin/network/site-info.php</a></li>
<li><a href="#trunkwpadminnetworksitenewphp">trunk/wp-admin/network/site-new.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminnetworksiteinfophp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/site-info.php (16305 => 16306)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/site-info.php 2010-11-11 16:34:22 UTC (rev 16305)
+++ trunk/wp-admin/network/site-info.php 2010-11-11 16:57:22 UTC (rev 16306)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">
</span><span class="cx"> if ( isset( $_POST['update_home_url'] ) && $_POST['update_home_url'] == 'update' ) {
</span><span class="cx"> $blog_address = get_blogaddress_by_domain( $_POST['blog']['domain'], $_POST['blog']['path'] );
</span><del>- if ( get_option( 'siteurl' ) != $blog_address )
</del><ins>+ if ( get_option( 'siteurl' ) != $blog_address )
</ins><span class="cx"> update_option( 'siteurl', $blog_address );
</span><span class="cx">
</span><span class="cx"> if ( get_option( 'home' ) != $blog_address )
</span><span class="lines">@@ -148,4 +148,4 @@
</span><span class="cx">
</span><span class="cx"> </div>
</span><span class="cx"> <?php
</span><del>-require('../admin-footer.php');
</del><span class="cx">\ No newline at end of file
</span><ins>+require('../admin-footer.php');
</ins></span></pre></div>
<a id="trunkwpadminnetworksitenewphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/site-new.php (16305 => 16306)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/site-new.php 2010-11-11 16:34:22 UTC (rev 16305)
+++ trunk/wp-admin/network/site-new.php 2010-11-11 16:57:22 UTC (rev 16306)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> wp_die( __( 'You do not have permission to access this page.' ) );
</span><span class="cx">
</span><span class="cx"> if ( is_array( $_POST['blog'] ) == false )
</span><del>- wp_die( __( 'Can&#8217;t create an empty site.' ) );
</del><ins>+ wp_die( __( 'Can&#8217;t create an empty site.' ) );
</ins><span class="cx"> $blog = $_POST['blog'];
</span><span class="cx"> $domain = '';
</span><span class="cx"> if ( ! preg_match( '/(--)/', $blog['domain'] ) && preg_match( '|^([a-zA-Z0-9-])+$|', $blog['domain'] ) )
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> if ( !is_super_admin( $user_id ) && !get_user_option( 'primary_blog', $user_id ) )
</span><span class="cx"> update_user_option( $user_id, 'primary_blog', $id, true );
</span><span class="cx"> $content_mail = sprintf( __( "New site created by %1s\n\nAddress: http://%2s\nName: %3s"), $current_user->user_login , $newdomain . $path, stripslashes( $title ) );
</span><del>- wp_mail( get_site_option('admin_email'), sprintf( __( '[%s] New Site Created' ), $current_site->site_name ), $content_mail, 'From: "Site Admin" <' . get_site_option( 'admin_email' ) . '>' );
</del><ins>+ wp_mail( get_site_option('admin_email'), sprintf( __( '[%s] New Site Created' ), $current_site->site_name ), $content_mail, 'From: "Site Admin" <' . get_site_option( 'admin_email' ) . '>' );
</ins><span class="cx"> wpmu_welcome_notification( $id, $user_id, $password, $title, array( 'public' => 1 ) );
</span><span class="cx"> wp_redirect( add_query_arg( array('update' => 'added'), 'site-new.php' ) );
</span><span class="cx"> exit;
</span></span></pre>
</div>
</div>
</body>
</html>