<!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>[14705] trunk/wp-admin/includes: more use get_blogaddress_by_name,
see #12735</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14705">14705</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-05-16 23:00:48 +0000 (Sun, 16 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>more use get_blogaddress_by_name, see <a href="http://trac.wordpress.org/ticket/12735">#12735</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesexportphp">trunk/wp-admin/includes/export.php</a></li>
<li><a href="#trunkwpadminincludesupgradephp">trunk/wp-admin/includes/upgrade.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesexportphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/export.php (14704 => 14705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/export.php 2010-05-16 22:36:58 UTC (rev 14704)
+++ trunk/wp-admin/includes/export.php 2010-05-16 23:00:48 UTC (rev 14705)
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx">
</span><span class="cx"> // mu: the base url
</span><span class="cx"> if ( isset( $current_site->domain ) )
</span><del>- return 'http://' . $current_site->domain . $current_site->path;
</del><ins>+ return network_home_url();
</ins><span class="cx"> // wp: the blog url
</span><span class="cx"> else
</span><span class="cx"> return get_bloginfo_rss( 'url' );
</span></span></pre></div>
<a id="trunkwpadminincludesupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/upgrade.php (14704 => 14705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/upgrade.php 2010-05-16 22:36:58 UTC (rev 14704)
+++ trunk/wp-admin/includes/upgrade.php 2010-05-16 23:00:48 UTC (rev 14705)
</span><span class="lines">@@ -198,7 +198,7 @@
</span><span class="cx"> if ( empty($first_post) )
</span><span class="cx"> $first_post = stripslashes( __( 'Welcome to <a href="SITE_URL">SITE_NAME</a>. This is your first post. Edit or delete it, then start blogging!' ) );
</span><span class="cx">
</span><del>- $first_post = str_replace( "SITE_URL", esc_url("http://" . $current_site->domain . $current_site->path), $first_post );
</del><ins>+ $first_post = str_replace( "SITE_URL", esc_url( network_home_url() ), $first_post );
</ins><span class="cx"> $first_post = str_replace( "SITE_NAME", $current_site->site_name, $first_post );
</span><span class="cx"> } else {
</span><span class="cx"> $first_post = __('Welcome to WordPress. This is your first post. Edit or delete it, then start blogging!');
</span><span class="lines">@@ -229,7 +229,7 @@
</span><span class="cx"> $first_comment = __('Hi, this is a comment.<br />To delete a comment, just log in and view the post&#039;s comments. There you will have the option to edit or delete them.');
</span><span class="cx"> if ( is_multisite() ) {
</span><span class="cx"> $first_comment_author = get_site_option( 'first_comment_author', $first_comment_author );
</span><del>- $first_comment_url = get_site_option( 'first_comment_url', 'http://' . $current_site->domain . $current_site->path );
</del><ins>+ $first_comment_url = get_site_option( 'first_comment_url', network_home_url() );
</ins><span class="cx"> $first_comment = get_site_option( 'first_comment', $first_comment );
</span><span class="cx"> }
</span><span class="cx"> $wpdb->insert( $wpdb->comments, array(
</span></span></pre>
</div>
</div>
</body>
</html>