WP Merge (kill the foo!)

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

3 files changed, 7 insertions, 3 deletions

diff --git a/wp-includes/deprecated.php b/wp-includes/deprecated.php
index 0794b59..bd8d21a 100644
--- a/wp-includes/deprecated.php
+++ b/wp-includes/deprecated.php
@@ -407,7 +407,8 @@ function get_autotoggle($id = 0) {
 }

 

 function list_cats($optionall = 1, $all = 'All', $sort_column = 'ID', $sort_order = 'asc', $file = '', $list = true, $optiondates = 0, $optioncount = 0, $hide_empty = 1, $use_desc_for_title = 1, $children=FALSE, $child_of=0, $categories=0, $recurse=0, $feed = '', $feed_image = '', $exclude = '', $hierarchical=FALSE) {

-	$query = "optionall=$optionall&all=$all&sort_column=$sort_column&sort_order=$sort_order&list=$list&optiondates=$optiondates&optioncount=$optioncount&hide_empty=$hide_empty&use_desc_for_title=$use_desc_for_title&child_of=$child_of&feed=$feed&feed_image=$feed_image&exclude=$exclude&hierarchical=$hierarchical";

+	$query = compact('optionall', 'all', 'sort_column', 'sort_order', 'file', 'list', 'optiondates', 'optioncount', 'hide_empty', 'use_desc_for_title', 'children',

+		'child_of', 'categories', 'recurse', 'feed', 'feed_image', 'exclude', 'hierarchical');

 	return wp_list_cats($query);

 }

 

diff --git a/wp-includes/js/tinymce/tiny_mce_gzip.php b/wp-includes/js/tinymce/tiny_mce_gzip.php
index e975389..d92e08e 100644
--- a/wp-includes/js/tinymce/tiny_mce_gzip.php
+++ b/wp-includes/js/tinymce/tiny_mce_gzip.php
@@ -44,7 +44,7 @@ function wp_tinymce_lang($path) {
 		$replace1 = "'tinyMCELang[\\1\\2\\1]\\3'.stripslashes('\\4').__('\\5').stripslashes('\\4')";
 
 		$search2 = "/\\s:\\s(['\"])(.*)\\1(,|\\s*})/Uem";
-		$replace2 = "' : '.stripslashes('\\1').__('\\2foo').stripslashes('\\1').'\\3'";
+		$replace2 = "' : '.stripslashes('\\1').__('\\2').stripslashes('\\1').'\\3'";
 
 		$search = array($search1, $search2);
 		$replace = array($replace1, $replace2);
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");