From e1eab74aa69f92da55aac695c04f8292d5ff088d Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Tue, 5 Aug 2014 01:31:16 +0000
Subject: [PATCH] Use wp_normalize_path() in plugins_url().

props paulschreiber.
fixes #29058.
Built from https://develop.svn.wordpress.org/trunk@29375


git-svn-id: http://core.svn.wordpress.org/trunk@29153 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/link-template.php | 9 +++------
 wp-includes/version.php       | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php
index 31ee627e80..7a7b7874ed 100644
--- a/wp-includes/link-template.php
+++ b/wp-includes/link-template.php
@@ -2641,12 +2641,9 @@ function content_url($path = '') {
 */
 function plugins_url( $path = '', $plugin = '' ) {
 
-	$path = str_replace( '\\' ,'/', $path ); // sanitize for Win32 installs
-	$path = preg_replace( '|/+|', '/', $path );
-	$plugin = str_replace( '\\' ,'/', $plugin ); // sanitize for Win32 installs
-	$plugin = preg_replace( '|/+|', '/', $plugin );
-	$mu_plugin_dir = str_replace( '\\' ,'/', WPMU_PLUGIN_DIR ); // sanitize for Win32 installs
-	$mu_plugin_dir = preg_replace( '|/+|', '/', $mu_plugin_dir );
+	$path = wp_normalize_path( $path );
+	$plugin = wp_normalize_path( $plugin );
+	$mu_plugin_dir = wp_normalize_path( WPMU_PLUGIN_DIR );
 
 	if ( !empty($plugin) && 0 === strpos($plugin, $mu_plugin_dir) )
 		$url = WPMU_PLUGIN_URL;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index f14fee4516..ca54aafffe 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.0-beta2-20140804';
+$wp_version = '4.0-beta2-20140805';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.