<!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>[14702] trunk/wp-includes/link-template.php: improvements to get_home/
site_url, props andreasnrb + code cleanup, see #12735</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14702">14702</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-05-16 21:58:31 +0000 (Sun, 16 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>improvements to get_home/site_url, props andreasnrb + code cleanup, see <a href="http://trac.wordpress.org/ticket/12735">#12735</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludeslinktemplatephp">trunk/wp-includes/link-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/link-template.php (14701 => 14702)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php 2010-05-16 21:24:40 UTC (rev 14701)
+++ trunk/wp-includes/link-template.php 2010-05-16 21:58:31 UTC (rev 14702)
</span><span class="lines">@@ -1846,13 +1846,13 @@
</span><span class="cx"> function get_home_url( $blog_id = null, $path = '', $scheme = null ) {
</span><span class="cx"> $orig_scheme = $scheme;
</span><span class="cx">
</span><del>- if ( !in_array($scheme, array('http', 'https')) )
</del><ins>+ if ( !in_array( $scheme, array( 'http', 'https' ) ) )
</ins><span class="cx"> $scheme = is_ssl() && !is_admin() ? 'https' : 'http';
</span><span class="cx">
</span><del>- if ( empty($blog_id) || !is_multisite() )
- $home = get_option('home');
</del><ins>+ if ( empty( $blog_id ) || !is_multisite() )
+ $home = get_option( 'home' );
</ins><span class="cx"> else
</span><del>- $home = untrailingslashit(get_blogaddress_by_id($blog_id));
</del><ins>+ $home = get_blog_option( $blog_id, 'home' );
</ins><span class="cx">
</span><span class="cx"> $url = str_replace( 'http://', "$scheme://", $home );
</span><span class="cx">
</span><span class="lines">@@ -1900,28 +1900,28 @@
</span><span class="cx"> function get_site_url( $blog_id = null, $path = '', $scheme = null ) {
</span><span class="cx"> // should the list of allowed schemes be maintained elsewhere?
</span><span class="cx"> $orig_scheme = $scheme;
</span><del>- if ( !in_array($scheme, array('http', 'https')) ) {
</del><ins>+ if ( !in_array( $scheme, array( 'http', 'https' ) ) ) {
</ins><span class="cx"> if ( ( 'login_post' == $scheme || 'rpc' == $scheme ) && ( force_ssl_login() || force_ssl_admin() ) )
</span><span class="cx"> $scheme = 'https';
</span><del>- elseif ( ('login' == $scheme) && ( force_ssl_admin() ) )
</del><ins>+ elseif ( ( 'login' == $scheme ) && force_ssl_admin() )
</ins><span class="cx"> $scheme = 'https';
</span><del>- elseif ( ('admin' == $scheme) && force_ssl_admin() )
</del><ins>+ elseif ( ( 'admin' == $scheme ) && force_ssl_admin() )
</ins><span class="cx"> $scheme = 'https';
</span><span class="cx"> else
</span><span class="cx"> $scheme = ( is_ssl() ? 'https' : 'http' );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( empty($blog_id) || !is_multisite() )
- $url = get_option('siteurl');
</del><ins>+ if ( empty( $blog_id ) || !is_multisite() )
+ $url = get_option( 'siteurl' );
</ins><span class="cx"> else
</span><del>- $url = untrailingslashit(get_blogaddress_by_id($blog_id));
</del><ins>+ $url = get_blog_option( $blog_id, 'siteurl' );
</ins><span class="cx">
</span><span class="cx"> $url = str_replace( 'http://', "{$scheme}://", $url );
</span><span class="cx">
</span><del>- if ( !empty($path) && is_string($path) && strpos($path, '..') === false )
- $url .= '/' . ltrim($path, '/');
</del><ins>+ if ( !empty( $path ) && is_string( $path ) && strpos( $path, '..' ) === false )
+ $url .= '/' . ltrim( $path, '/' );
</ins><span class="cx">
</span><del>- return apply_filters('site_url', $url, $path, $orig_scheme, $blog_id);
</del><ins>+ return apply_filters( 'site_url', $url, $path, $orig_scheme, $blog_id );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>