summaryrefslogtreecommitdiffstats
path: root/wp-includes/plugin.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2008-01-11 17:36:12 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2008-01-11 17:36:12 +0000
commit521aff819ab185143b5d9cb2d3c68d10bba28420 (patch)
tree596fd7af58e1163035cc245038bfef4f9165db6b /wp-includes/plugin.php
parentf4c6c9f9c07caadb3ce3f4d48f1aa796e3534928 (diff)
downloadwordpress-mu-521aff819ab185143b5d9cb2d3c68d10bba28420.tar.gz
wordpress-mu-521aff819ab185143b5d9cb2d3c68d10bba28420.tar.xz
wordpress-mu-521aff819ab185143b5d9cb2d3c68d10bba28420.zip
Restored line after it removed in a merge, fixes #535, props chmac
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1185 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/plugin.php')
-rw-r--r--wp-includes/plugin.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/wp-includes/plugin.php b/wp-includes/plugin.php
index 2c04c1c..26b79ca 100644
--- a/wp-includes/plugin.php
+++ b/wp-includes/plugin.php
@@ -242,6 +242,7 @@ function plugin_basename($file) {
$file = str_replace('\\','/',$file); // sanitize for Win32 installs
$file = preg_replace('|/+|','/', $file); // remove any duplicate slash
$file = preg_replace('|^.*/wp-content/plugins/|','',$file); // get relative path from plugins dir
+ $file = preg_replace('|^.*/wp-content/mu-plugins/|','',$file); // get relative path from mu-plugins dir
return $file;
}