<!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" />
<title>[19870] trunk/wp-includes/link-template.php: Introduce 'relative' scheme to return only the paths for home_url, site, admin, network_, and get_ variants.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/19870">19870</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-02-08 16:09:41 +0000 (Wed, 08 Feb 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduce 'relative' scheme to return only the paths for home_url, site, admin, network_, and get_ variants. props SergeyBiryukov, see <a href="http://core.trac.wordpress.org/ticket/18952">#18952</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 (19869 => 19870)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php 2012-02-08 16:04:58 UTC (rev 19869)
+++ trunk/wp-includes/link-template.php 2012-02-08 16:09:41 UTC (rev 19870)
</span><span class="lines">@@ -1834,7 +1834,7 @@
</span><span class="cx"> * @uses get_home_url()
</span><span class="cx"> *
</span><span class="cx"> * @param string $path (optional) Path relative to the home url.
</span><del>- * @param string $scheme (optional) Scheme to give the home url context. Currently 'http', 'https'.
</del><ins>+ * @param string $scheme (optional) Scheme to give the home url context. Currently 'http', 'https', or 'relative'.
</ins><span class="cx"> * @return string Home url link with optional path appended.
</span><span class="cx"> */
</span><span class="cx"> function home_url( $path = '', $scheme = null ) {
</span><span class="lines">@@ -1853,13 +1853,13 @@
</span><span class="cx"> *
</span><span class="cx"> * @param int $blog_id (optional) Blog ID. Defaults to current blog.
</span><span class="cx"> * @param string $path (optional) Path relative to the home url.
</span><del>- * @param string $scheme (optional) Scheme to give the home url context. Currently 'http', 'https'.
</del><ins>+ * @param string $scheme (optional) Scheme to give the home url context. Currently 'http', 'https', or 'relative'.
</ins><span class="cx"> * @return string Home url link with optional path appended.
</span><span class="cx"> */
</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', 'relative' ) ) )
</ins><span class="cx"> $scheme = is_ssl() && !is_admin() ? 'https' : 'http';
</span><span class="cx">
</span><span class="cx"> if ( empty( $blog_id ) || !is_multisite() )
</span><span class="lines">@@ -1867,7 +1867,9 @@
</span><span class="cx"> else
</span><span class="cx"> $url = get_blog_option( $blog_id, 'home' );
</span><span class="cx">
</span><del>- if ( 'http' != $scheme )
</del><ins>+ if ( 'relative' == $scheme )
+ $url = preg_replace( '#^.+://[^/]*#', '', $url );
+ elseif ( 'http' != $scheme )
</ins><span class="cx"> $url = str_replace( 'http://', "$scheme://", $url );
</span><span class="cx">
</span><span class="cx"> if ( !empty( $path ) && is_string( $path ) && strpos( $path, '..' ) === false )
</span><span class="lines">@@ -1889,7 +1891,7 @@
</span><span class="cx"> * @uses get_site_url()
</span><span class="cx"> *
</span><span class="cx"> * @param string $path Optional. Path relative to the site url.
</span><del>- * @param string $scheme Optional. Scheme to give the site url context. Currently 'http', 'https', 'login', 'login_post', or 'admin'.
</del><ins>+ * @param string $scheme Optional. Scheme to give the site url context. Currently 'http', 'https', 'login', 'login_post', 'admin', or 'relative'.
</ins><span class="cx"> * @return string Site url link with optional path appended.
</span><span class="cx"> */
</span><span class="cx"> function site_url( $path = '', $scheme = null ) {
</span><span class="lines">@@ -1908,13 +1910,13 @@
</span><span class="cx"> *
</span><span class="cx"> * @param int $blog_id (optional) Blog ID. Defaults to current blog.
</span><span class="cx"> * @param string $path Optional. Path relative to the site url.
</span><del>- * @param string $scheme Optional. Scheme to give the site url context. Currently 'http', 'https', 'login', 'login_post', or 'admin'.
</del><ins>+ * @param string $scheme Optional. Scheme to give the site url context. Currently 'http', 'https', 'login', 'login_post', 'admin', or 'relative'.
</ins><span class="cx"> * @return string Site url link with optional path appended.
</span><span class="cx"> */
</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', 'relative' ) ) ) {
</ins><span class="cx"> if ( ( 'login_post' == $scheme || 'rpc' == $scheme ) && ( force_ssl_login() || force_ssl_admin() ) )
</span><span class="cx"> $scheme = 'https';
</span><span class="cx"> elseif ( ( 'login' == $scheme ) && force_ssl_admin() )
</span><span class="lines">@@ -1930,7 +1932,9 @@
</span><span class="cx"> else
</span><span class="cx"> $url = get_blog_option( $blog_id, 'siteurl' );
</span><span class="cx">
</span><del>- if ( 'http' != $scheme )
</del><ins>+ if ( 'relative' == $scheme )
+ $url = preg_replace( '#^.+://[^/]*#', '', $url );
+ elseif ( 'http' != $scheme )
</ins><span class="cx"> $url = str_replace( 'http://', "{$scheme}://", $url );
</span><span class="cx">
</span><span class="cx"> if ( !empty( $path ) && is_string( $path ) && strpos( $path, '..' ) === false )
</span><span class="lines">@@ -2061,7 +2065,7 @@
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> *
</span><span class="cx"> * @param string $path Optional. Path relative to the site url.
</span><del>- * @param string $scheme Optional. Scheme to give the site url context. Currently 'http', 'https', 'login', 'login_post', or 'admin'.
</del><ins>+ * @param string $scheme Optional. Scheme to give the site url context. Currently 'http', 'https', 'login', 'login_post', 'admin', or 'relative'.
</ins><span class="cx"> * @return string Site url link with optional path appended.
</span><span class="cx"> */
</span><span class="cx"> function network_site_url( $path = '', $scheme = null ) {
</span><span class="lines">@@ -2071,7 +2075,7 @@
</span><span class="cx"> return site_url($path, $scheme);
</span><span class="cx">
</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', 'relative' ) ) ) {
</ins><span class="cx"> if ( ( 'login_post' == $scheme || 'rpc' == $scheme ) && ( force_ssl_login() || force_ssl_admin() ) )
</span><span class="cx"> $scheme = 'https';
</span><span class="cx"> elseif ( ('login' == $scheme) && ( force_ssl_admin() ) )
</span><span class="lines">@@ -2082,7 +2086,10 @@
</span><span class="cx"> $scheme = ( is_ssl() ? 'https' : 'http' );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $url = $scheme . '://' . $current_site->domain . $current_site->path;
</del><ins>+ if ( 'relative' == $scheme )
+ $url = $current_site->path;
+ else
+ $url = $scheme . '://' . $current_site->domain . $current_site->path;
</ins><span class="cx">
</span><span class="cx"> if ( !empty($path) && is_string($path) && strpos($path, '..') === false )
</span><span class="cx"> $url .= ltrim($path, '/');
</span><span class="lines">@@ -2101,7 +2108,7 @@
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> *
</span><span class="cx"> * @param string $path (optional) Path relative to the home url.
</span><del>- * @param string $scheme (optional) Scheme to give the home url context. Currently 'http', 'https'.
</del><ins>+ * @param string $scheme (optional) Scheme to give the home url context. Currently 'http', 'https', or 'relative'.
</ins><span class="cx"> * @return string Home url link with optional path appended.
</span><span class="cx"> */
</span><span class="cx"> function network_home_url( $path = '', $scheme = null ) {
</span><span class="lines">@@ -2112,10 +2119,13 @@
</span><span class="cx">
</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', 'relative' ) ) )
</ins><span class="cx"> $scheme = is_ssl() && !is_admin() ? 'https' : 'http';
</span><span class="cx">
</span><del>- $url = $scheme . '://' . $current_site->domain . $current_site->path;
</del><ins>+ if ( 'relative' == $scheme )
+ $url = $current_site->path;
+ else
+ $url = $scheme . '://' . $current_site->domain . $current_site->path;
</ins><span class="cx">
</span><span class="cx"> if ( !empty( $path ) && is_string( $path ) && strpos( $path, '..' ) === false )
</span><span class="cx"> $url .= ltrim( $path, '/' );
</span></span></pre>
</div>
</div>
</body>
</html>