Changeset 5713 for branches/2.2/wp-includes/functions.php

Timestamp:

06/15/2007 05:35:56 PM (19 years ago)

Author:

ryan

Message:

wp_parse_str() from mdawaffe. fixes #4467

File:

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

branches/2.2/wp-includes/functions.php

@@ -802 +802 @@
     }
 
-    parse_str($query, $qs);
-    if ( get_magic_quotes_gpc() )
-        $qs = stripslashes_deep($qs); // parse_str() adds slashes if magicquotes is on.  See: http://php.net/parse_str
+    wp_parse_str($query, $qs);
     $qs = urlencode_deep($qs);
     if ( is_array(func_get_arg(0)) ) {
@@ -1482 +1480 @@
 
 function wp_parse_args( $args, $defaults = '' ) {
-    if ( is_array($args) ) :
+    if ( is_array( $args ) )
         $r =& $args;
-    else :
-        parse_str( $args, $r );
-        if ( get_magic_quotes_gpc() )
-            $r = stripslashes_deep( $r );
-    endif;
-
-    if ( is_array($defaults) ) :
-        extract($defaults);
-        extract($r);
-        return compact(array_keys($defaults)); // only those options defined in $defaults
-    else :
+    else
+        wp_parse_str( $args, $r );
+
+    if ( is_array( $defaults ) )
+        return array_merge( $defaults, $r );
+    else
         return $r;
-    endif;
 }