Changeset 5709 for trunk/wp-includes/functions.php

Timestamp:

06/14/2007 10:46:59 PM (16 years ago)

Author:

ryan

Message:

wp_parse_str() from mdawaffe. see #4467

File:

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

trunk/wp-includes/functions.php

@@ -605 +605 @@
     }
 
-    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)) ) {
@@ -1289 +1287 @@
 
 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 );
-        }
-    }
-
-    if ( is_array( $defaults ) ) {
+    else
+        wp_parse_str( $args, $r );
+
+    if ( is_array( $defaults ) )
         return array_merge( $defaults, $r );
-    } else {
+    else
         return $r;
-    }
 }