Changes from trunk/wp-includes/formatting.php at r5262 to branches/2.2/wp-includes/formatting.php at r5735

File:

• branches/2.2/wp-includes/formatting.php (modified) (2 diffs)

branches/2.2/wp-includes/formatting.php

@@ -1104 +1104 @@
 function js_escape($text) {
     $safe_text = wp_specialchars($text, 'double');
-    $safe_text = str_replace(''', "'", $safe_text);
+    $safe_text = preg_replace('/&#(x)?0*(?(1)27|39);?/i', "'", stripslashes($safe_text));
     $safe_text = preg_replace("/\r?\n/", "\\n", addslashes($safe_text));
     return apply_filters('js_escape', $safe_text, $text);
@@ -1119 +1119 @@
 }
 
+function wp_parse_str( $string, &$array ) {
+    parse_str( $string, $array );
+    if ( get_magic_quotes_gpc() )
+        $array = stripslashes_deep( $array ); // parse_str() adds slashes if magicquotes is on.  See: http://php.net/parse_str
+    $array = apply_filters( 'wp_parse_str', $array );
+}
+
 ?>