Changeset 12963

Timestamp:

02/05/2010 12:39:04 PM (15 years ago)

Author:

dd32

Message:

Fix plugins_url() for MU-plugins when running on Windows. Fixes #12080

File:

• trunk/wp-includes/link-template.php (modified) (1 diff)

trunk/wp-includes/link-template.php

@@ -1866 +1866 @@
     $scheme = ( is_ssl() ? 'https' : 'http' );
 
-    if ( $plugin !== '' && preg_match('#^' . preg_quote(WPMU_PLUGIN_DIR . DIRECTORY_SEPARATOR, '#') . '#', $plugin) ) {
+    $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) )
         $url = WPMU_PLUGIN_URL;
-    } else {
+    else
         $url = WP_PLUGIN_URL;
-    }
-
-    if ( 0 === strpos($url, 'http') ) {
-        if ( is_ssl() )
-            $url = str_replace( 'http://', "{$scheme}://", $url );
-    }
+
+    if ( 0 === strpos($url, 'http') && is_ssl() )
+        $url = str_replace( 'http://', "{$scheme}://", $url );
 
     if ( !empty($plugin) && is_string($plugin) ) {
         $folder = dirname(plugin_basename($plugin));
-        if ('.' != $folder)
+        if ( '.' != $folder )
             $url .= '/' . ltrim($folder, '/');
     }