diff options
author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-05-27 10:21:38 +0000 |
---|---|---|
committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-05-27 10:21:38 +0000 |
commit | 51f4a074137c02d4b437161fb235478be53b7a7f (patch) | |
tree | 31fb6c238fe249c98b48723c8d804f2c5b6f3e57 /wp-includes/plugin.php | |
parent | 57d1a984f6b10572b02d769c24add1c178e1e7a4 (diff) | |
download | wordpress-mu-51f4a074137c02d4b437161fb235478be53b7a7f.tar.gz wordpress-mu-51f4a074137c02d4b437161fb235478be53b7a7f.tar.xz wordpress-mu-51f4a074137c02d4b437161fb235478be53b7a7f.zip |
Merged out code, fixes #535 (again), props chmac
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1315 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/plugin.php')
-rw-r--r-- | wp-includes/plugin.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/wp-includes/plugin.php b/wp-includes/plugin.php index 556570a..829efc8 100644 --- a/wp-includes/plugin.php +++ b/wp-includes/plugin.php @@ -449,6 +449,7 @@ function plugin_basename($file) { $file = str_replace('\\','/',$file); // sanitize for Win32 installs $file = preg_replace('|/+|','/', $file); // remove any duplicate slash $file = preg_replace('|^.*/' . PLUGINDIR . '/|','',$file); // get relative path from plugins dir + $file = preg_replace('|^.*/' . MUPLUGINDIR . '/|','',$file); // get relative path from plugins dir return $file; } |