Changeset 11069

Timestamp:

04/23/2009 08:16:06 AM (16 years ago)

Author:

azaozz

Message:

Make plugin_dir() and plugin_basename() work for mu-plugins directory, props Denis-de-Bernardy, fixes #9561

Location:

trunk/wp-includes

Files:

• link-template.php (modified) (2 diffs)
• plugin.php (modified) (1 diff)

trunk/wp-includes/link-template.php

@@ -1776 +1776 @@
 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() )
@@ -1782 +1788 @@
     }
 
-    if ( !empty($plugin) && is_string($plugin) )
-    {
+    if ( !empty($plugin) && is_string($plugin) ) {
         $folder = dirname(plugin_basename($plugin));
         if ('.' != $folder)

trunk/wp-includes/plugin.php

@@ -493 +493 @@
     $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;
 }