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

Timestamp:

05/09/2007 04:19:19 AM (19 years ago)

Author:

rob1n

Message:

Bit of clean-up.

File:

• trunk/wp-includes/functions.php (modified) (1 diff)

trunk/wp-includes/functions.php

@@ -1491 +1491 @@
 
 function wp_parse_args( $args, $defaults = '' ) {
-    if ( is_array($args) ) :
+    if ( is_array( $args ) ) {
         $r =& $args;
-    else :
+    } else {
         parse_str( $args, $r );
-        if ( get_magic_quotes_gpc() )
+        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 :
+        }
+    }
+    
+    if ( is_array( $defaults ) ) {
+        extract( $defaults );
+        extract( $r );
+        // Note: this only returns the variables that were in $defaults 
+        // to begin with. All other variables are discarded.
+        return compact( array_keys( $defaults ) );
+    } else {
         return $r;
-    endif;
+    }
 }