From 4f250c27cf627ccf663f759f77e536272fbdc3f9 Mon Sep 17 00:00:00 2001 From: azaozz Date: Thu, 23 Apr 2009 21:45:38 +0000 Subject: [PATCH] Remove slash from plugin_basename(), props alexrabe, fixes #9561 git-svn-id: http://svn.automattic.com/wordpress/trunk@11072 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/plugin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wp-includes/plugin.php b/wp-includes/plugin.php index 99169861c9..2f7d4004a5 100644 --- a/wp-includes/plugin.php +++ b/wp-includes/plugin.php @@ -494,7 +494,7 @@ function plugin_basename($file) { $plugin_dir = preg_replace('|/+|','/', $plugin_dir); // remove any duplicate slash $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 + $file = preg_replace('#^' . preg_quote($plugin_dir, '#') . '/|^' . preg_quote($mu_plugin_dir, '#') . '/#','',$file); // get relative path from plugins dir return $file; }