WP Merge

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@482 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 1 insertions, 0 deletions

diff --git a/wp-inst/wp-includes/functions.php b/wp-inst/wp-includes/functions.php
index 8cd8503..74b8c56 100644
--- a/wp-inst/wp-includes/functions.php
+++ b/wp-inst/wp-includes/functions.php
@@ -2259,6 +2259,7 @@ function register_deactivation_hook($file, $function) {
 }
 
 function plugin_basename($file) {
+	$file = preg_replace('|\\\\+|', '\\\\', $file);
 	$file = preg_replace('/^.*wp-content[\\\\\/]plugins[\\\\\/]/', '', $file);
 	return $file;
 }