<!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>[12952] trunk: add siteurl filter for ms upgrades, props nacin,
fixes #12069</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12952">12952</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-02-04 19:26:38 +0000 (Thu, 04 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>add siteurl filter for ms upgrades, props nacin, fixes <a href="http://trac.wordpress.org/ticket/12069">#12069</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminmsupgradesitephp">trunk/wp-admin/ms-upgrade-site.php</a></li>
<li><a href="#trunkwpincludesmsfunctionsphp">trunk/wp-includes/ms-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminmsupgradesitephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-upgrade-site.php (12951 => 12952)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-upgrade-site.php 2010-02-04 19:11:51 UTC (rev 12951)
+++ trunk/wp-admin/ms-upgrade-site.php 2010-02-04 19:26:38 UTC (rev 12952)
</span><span class="lines">@@ -33,8 +33,7 @@
</span><span class="cx"> echo "<ul>";
</span><span class="cx"> foreach ( (array) $blogs as $details ) {
</span><span class="cx"> if ( $details['spam'] == 0 && $details['deleted'] == 0 && $details['archived'] == 0 ) {
</span><del>- $blog_prefix = $wpdb->get_blog_prefix( $details[ 'blog_id' ] );
- $siteurl = $wpdb->get_var( "SELECT option_value from {$blog_prefix}options WHERE option_name = 'siteurl'" );
</del><ins>+ $siteurl = get_blog_option( $details['blog_id'], 'siteurl' );
</ins><span class="cx"> echo "<li>$siteurl</li>";
</span><span class="cx"> $response = wp_remote_get( trailingslashit( $siteurl ) . "wp-admin/upgrade.php?step=1", array( 'timeout' => 120, 'httpversion' => '1.1' ) );
</span><span class="cx"> if ( is_wp_error( $response ) )
</span></span></pre></div>
<a id="trunkwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-functions.php (12951 => 12952)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php 2010-02-04 19:11:51 UTC (rev 12951)
+++ trunk/wp-includes/ms-functions.php 2010-02-04 19:26:38 UTC (rev 12952)
</span><span class="lines">@@ -272,7 +272,7 @@
</span><span class="cx"> return get_blog_option( $blog_id, 'siteurl' );
</span><span class="cx">
</span><span class="cx"> if ( 'siteurl' == $setting || 'home' == $setting || 'category_base' == $setting )
</span><del>- $value = preg_replace( '|/+$|', '', $value );
</del><ins>+ $value = untrailingslashit( $value );
</ins><span class="cx">
</span><span class="cx"> if (! @unserialize( $value ) )
</span><span class="cx"> $value = stripslashes( $value );
</span></span></pre>
</div>
</div>
</body>
</html>