Changeset 5444 for trunk/wp-includes/post.php

Timestamp:

05/11/2007 03:10:05 AM (18 years ago)

Author:

rob1n

Message:

Use wp_parse_args(). fixes #4237

File:

• trunk/wp-includes/post.php (modified) (3 diffs)

trunk/wp-includes/post.php

@@ -28 +28 @@
 function &get_children($args = '', $output = OBJECT) {
     global $post_cache, $wpdb, $blog_id;
-
-    if ( empty($args) ) {
-        if ( isset($GLOBALS['post']) )
-            $r = array('post_parent' => & $GLOBALS['post']->post_parent);
-        else
+    
+    if ( empty( $args ) ) {
+        if ( isset( $GLOBALS['post'] ) ) {
+            $args = 'post_parent=' . (int) $GLOBALS['post']->post_parent;
+        } else {
             return false;
-    } elseif ( is_object($args) )
-        $r = array('post_parent' => $post->post_parent);
-    elseif ( is_numeric($args) )
-        $r = array('post_parent' => $args);
-    elseif ( is_array($args) )
-        $r = &$args;
-    else
-        parse_str($args, $r);
-
-    $defaults = array('numberposts' => -1, 'post_type' => '', 'post_status' => '', 'post_parent' => 0);
-    $r = array_merge($defaults, $r);
+        }
+    } elseif ( is_object( $args ) ) {
+        $args = 'post_parent=' . (int) $args->post_parent;
+    } elseif ( is_numeric( $args ) ) {
+        $args = 'post_parent=' . (int) $args;
+    }
+    
+    $defaults = array(
+        'numberposts' => -1, 'post_type' => '', 
+        'post_status' => '', 'post_parent' => 0
+    );
+    
+    $r = wp_parse_args( $args, $defaults );
 
     $children = get_posts( $r );
@@ -173 +175 @@
 function get_posts($args) {
     global $wpdb;
-
-    if ( is_array($args) )
-        $r = &$args;
-    else
-        parse_str($args, $r);
-
-    $defaults = array('numberposts' => 5, 'offset' => 0, 'category' => 0,
-        'orderby' => 'post_date', 'order' => 'DESC', 'include' => '', 'exclude' => '',
-        'meta_key' => '', 'meta_value' =>'', 'post_type' => 'post', 'post_status' => 'publish', 'post_parent' => 0);
-    $r = array_merge($defaults, $r);
-    extract($r);
+    
+    $defaults = array(
+        'numberposts' => 5, 'offset' => 0, 
+        'category' => 0, 'orderby' => 'post_date', 
+        'order' => 'DESC', 'include' => '', 
+        'exclude' => '', 'meta_key' => '', 
+        'meta_value' =>'', 'post_type' => 'post', 
+        'post_status' => 'publish', 'post_parent' => 0
+    );
+    
+    $r = wp_parse_args( $args, $defaults );
+    extract( $r );
+    
     $numberposts = (int) $numberposts;
     $offset = (int) $offset;
@@ -1164 +1168 @@
 function &get_pages($args = '') {
     global $wpdb;
-
-    if ( is_array($args) )
-        $r = &$args;
-    else
-        parse_str($args, $r);
-
-    $defaults = array('child_of' => 0, 'sort_order' => 'ASC', 'sort_column' => 'post_title',
-                'hierarchical' => 1, 'exclude' => '', 'include' => '', 'meta_key' => '', 'meta_value' => '', 'authors' => '');
-    $r = array_merge($defaults, $r);
-    extract($r);
+    
+    $defaults = array(
+        'child_of' => 0, 'sort_order' => 'ASC', 
+        'sort_column' => 'post_title', 'hierarchical' => 1, 
+        'exclude' => '', 'include' => '', 
+        'meta_key' => '', 'meta_value' => '', 
+        'authors' => ''
+    );
+    
+    $r = wp_parse_args( $args, $defaults );
+    extract( $r );
 
     $key = md5( serialize( $r ) );