From 3ee2661aeb601a93b99fbbef43d10b802788c3bc Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Fri, 30 Jun 2006 08:36:17 +0000
Subject: WP Merge (kill the foo!)

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

(limited to 'wp-includes/pluggable.php')

diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php
index 9c2440f..ab054bf 100644
--- a/wp-includes/pluggable.php
+++ b/wp-includes/pluggable.php
@@ -266,7 +266,10 @@ if ( !function_exists('wp_redirect') ) :
 function wp_redirect($location) {
 	global $is_IIS;
 
-	$location = str_replace( array("\n", "\r"), '', $location);
+	$location = preg_replace('|[^a-z0-9-~+_.?#=&;,/:%]|i', '', $location);
+
+	$strip = array('%0d', '%0a');
+	$location = str_replace($strip, '', $location);
 
 	if ($is_IIS)
 		header("Refresh: 0;url=$location");
-- 
cgit