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

Timestamp:

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

Author:

rob1n

Message:

Use wp_parse_args(). fixes #4237

File:

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

trunk/wp-includes/category.php

@@ -17 +17 @@
 function &get_categories($args = '') {
     global $wpdb, $category_links;
-
-    if ( is_array($args) )
-        $r = &$args;
-    else
-        parse_str($args, $r);
-
-    $defaults = array('type' => 'post', 'child_of' => 0, 'orderby' => 'name', 'order' => 'ASC',
-        'hide_empty' => true, 'include_last_update_time' => false, 'hierarchical' => 1, 'exclude' => '', 'include' => '',
-        'number' => '', 'pad_counts' => false);
-    $r = array_merge($defaults, $r);
-    if ( 'count' == $r['orderby'] )
+    
+    $defaults = array(
+        'type' => 'post', 'child_of' => 0, 
+        'orderby' => 'name', 'order' => 'ASC', 
+        'hide_empty' => true, 'include_last_update_time' => false, 
+        'hierarchical' => 1, 'exclude' => '', 
+        'include' => '', 'number' => '', 
+        'pad_counts' => false
+    );
+    
+    $r = wp_parse_args( $args, $defaults );
+    
+    if ( $r['orderby'] == 'count' ) {
         $r['orderby'] = 'category_count';
-    else
-        $r['orderby'] = "cat_" . $r['orderby'];  // restricts order by to cat_ID and cat_name fields
-    $r['number'] = (int) $r['number'];
-    extract($r);
+    } else {
+        $r['orderby'] = 'cat_' . $r['orderby'];
+    }
+    
+    extract( $r );
 
     $key = md5( serialize( $r ) );