<!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>[12963] trunk/wp-includes/link-template.php: Fix plugins_url()
for MU-plugins when running on Windows.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12963">12963</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-02-05 12:39:04 +0000 (Fri, 05 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix plugins_url() for MU-plugins when running on Windows. Fixes <a href="http://trac.wordpress.org/ticket/12080">#12080</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 (12962 => 12963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php 2010-02-04 23:24:15 UTC (rev 12962)
+++ trunk/wp-includes/link-template.php 2010-02-05 12:39:04 UTC (rev 12963)
</span><span class="lines">@@ -1865,20 +1865,23 @@
</span><span class="cx"> function plugins_url($path = '', $plugin = '') {
</span><span class="cx"> $scheme = ( is_ssl() ? 'https' : 'http' );
</span><span class="cx">
</span><del>- if ( $plugin !== '' && preg_match('#^' . preg_quote(WPMU_PLUGIN_DIR . DIRECTORY_SEPARATOR, '#') . '#', $plugin) ) {
</del><ins>+ $mu_plugin_dir = WPMU_PLUGIN_DIR;
+ foreach ( array('path', 'plugin', 'mu_plugin_dir') as $var ) {
+ $$var = str_replace('\\' ,'/', $$var); // sanitize for Win32 installs
+ $$var = preg_replace('|/+|', '/', $$var);
+ }
+
+ if ( !empty($plugin) && 0 === strpos($plugin, $mu_plugin_dir) )
</ins><span class="cx"> $url = WPMU_PLUGIN_URL;
</span><del>- } else {
</del><ins>+ else
</ins><span class="cx"> $url = WP_PLUGIN_URL;
</span><del>- }
</del><span class="cx">
</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://', "{$scheme}://", $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><del>- if ('.' != $folder)
</del><ins>+ if ( '.' != $folder )
</ins><span class="cx"> $url .= '/' . ltrim($folder, '/');
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>