From aa750edffae8aeb649b0b2f15900db988e588de7 Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Thu, 10 Nov 2005 09:33:43 +0000
Subject: WP Merge

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@429 7be80a69-a1ef-0310-a953-fb0f7c49ff36
---
 wp-inst/wp-includes/functions.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'wp-inst/wp-includes/functions.php')

diff --git a/wp-inst/wp-includes/functions.php b/wp-inst/wp-includes/functions.php
index 8e79a1d..4b65212 100644
--- a/wp-inst/wp-includes/functions.php
+++ b/wp-inst/wp-includes/functions.php
@@ -2136,7 +2136,9 @@ function register_deactivation_hook($file, $function) {
 }
 
 function plugin_basename($file) {
-	return preg_replace('/^.*wp-content[\\\\\/]plugins[\\\\\/]/', '', $file);
+	$file = preg_replace('/^.*wp-content[\\\\\/]plugins[\\\\\/]/', '', $file);
+	$file = stripslashes($file);
+	return $file;
 }
 
 ?>
-- 
cgit