<!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>[12964] trunk/wp-includes/link-template.php: Simplify https://
conversion in plugins_url()/content_url() functions</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12964">12964</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-02-05 12:45:21 +0000 (Fri, 05 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simplify https:// conversion in plugins_url()/content_url() functions</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 (12963 => 12964)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php 2010-02-05 12:39:04 UTC (rev 12963)
+++ trunk/wp-includes/link-template.php 2010-02-05 12:45:21 UTC (rev 12964)
</span><span class="lines">@@ -1838,12 +1838,9 @@
</span><span class="cx"> * @return string Content url link with optional path appended.
</span><span class="cx"> */
</span><span class="cx"> function content_url($path = '') {
</span><del>- $scheme = ( is_ssl() ? 'https' : 'http' );
</del><span class="cx"> $url = WP_CONTENT_URL;
</span><del>- if ( 0 === strpos($url, 'http') ) {
- if ( is_ssl() )
- $url = str_replace( 'http://', "{$scheme}://", $url );
- }
</del><ins>+ if ( 0 === strpos($url, 'http') && is_ssl() )
+ $url = str_replace( 'http://', 'https://', $url );
</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">@@ -1863,7 +1860,6 @@
</span><span class="cx"> * @return string Plugins url link with optional path appended.
</span><span class="cx"> */
</span><span class="cx"> function plugins_url($path = '', $plugin = '') {
</span><del>- $scheme = ( is_ssl() ? 'https' : 'http' );
</del><span class="cx">
</span><span class="cx"> $mu_plugin_dir = WPMU_PLUGIN_DIR;
</span><span class="cx"> foreach ( array('path', 'plugin', 'mu_plugin_dir') as $var ) {
</span><span class="lines">@@ -1877,7 +1873,7 @@
</span><span class="cx"> $url = WP_PLUGIN_URL;
</span><span class="cx">
</span><span class="cx"> if ( 0 === strpos($url, 'http') && is_ssl() )
</span><del>- $url = str_replace( 'http://', "{$scheme}://", $url );
</del><ins>+ $url = str_replace( 'http://', 'https://', $url );
</ins><span class="cx">
</span><span class="cx"> if ( !empty($plugin) && is_string($plugin) ) {
</span><span class="cx"> $folder = dirname(plugin_basename($plugin));
</span></span></pre>
</div>
</div>
</body>
</html>