Ticket #9561: 9561.diff

Users/denis/Sites/sem-pro/wp-includes/plugin.php

@@ -492 +492 @@
         $file = preg_replace('|/+|','/', $file); // remove any duplicate slash
         $plugin_dir = str_replace('\\','/',WP_PLUGIN_DIR); // sanitize for Win32 installs
         $plugin_dir = preg_replace('|/+|','/', $plugin_dir); // remove any duplicate slash
-        $file = preg_replace('|^' . preg_quote($plugin_dir, '|') . '/|','',$file); // get relative path from plugins dir
+        $mu_plugin_dir = str_replace('\\','/',WPMU_PLUGIN_DIR); // sanitize for Win32 installs
+        $mu_plugin_dir = preg_replace('|/+|','/', $mu_plugin_dir); // remove any duplicate slash
+        $file = preg_replace('#^' . preg_quote($plugin_dir, '#') . '|^' . preg_quote($mu_plugin_dir, '#') . '/#','',$file); // get relative path from plugins dir
         return $file;
 }
 

Users/denis/Sites/sem-pro/wp-includes/link-template.php

@@ -1752 +1752 @@
 */
 function plugins_url($path = '', $plugin = '') {
         $scheme = ( is_ssl() ? 'https' : 'http' );
-        $url = WP_PLUGIN_URL;
+        
+        if ( $plugin !== '' && preg_match('#^' . preg_quote(WPMU_PLUGIN_DIR . DIRECTORY_SEPARATOR, '#') . '#', $plugin) ) {
+                $url = WPMU_PLUGIN_URL;
+        } else {
+                $url = WP_PLUGIN_URL;
+        }
+
         if ( 0 === strpos($url, 'http') ) {
                 if ( is_ssl() )
                         $url = str_replace( 'http://', "{$scheme}://", $url );
         }
-
-        if ( !empty($plugin) && is_string($plugin) )
-        {
+        
+        if ( !empty($plugin) && is_string($plugin) ) {
                 $folder = dirname(plugin_basename($plugin));
                 if ('.' != $folder)
                         $url .= '/' . ltrim($folder, '/');
         }
-
+        
         if ( !empty($path) && is_string($path) && strpos($path, '..') === false )
                 $url .= '/' . ltrim($path, '/');