Changeset 5444 for trunk/wp-includes/post-template.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-template.php (modified) (3 diffs)

trunk/wp-includes/post-template.php

@@ -136 +136 @@
 
 function wp_link_pages($args = '') {
-    global $post;
-
-    if ( is_array($args) )
-        $r = &$args;
-    else
-        parse_str($args, $r);
-
-    $defaults = array('before' => '<p>' . __('Pages:'), 'after' => '</p>', 'next_or_number' => 'number', 'nextpagelink' => __('Next page'),
-            'previouspagelink' => __('Previous page'), 'pagelink' => '%', 'more_file' => '', 'echo' => 1);
-    $r = array_merge($defaults, $r);
-    extract($r);
-
-    global $id, $page, $numpages, $multipage, $more, $pagenow;
+    $defaults = array(
+        'before' => '<p>' . __('Pages:'), 'after' => '</p>', 
+        'next_or_number' => 'number', 'nextpagelink' => __('Next page'), 
+        'previouspagelink' => __('Previous page'), 'pagelink' => '%', 
+        'more_file' => '', 'echo' => 1
+    );
+    
+    $r = wp_parse_args( $args, $defaults );
+    extract( $r );
+
+    global $post, $id, $page, $numpages, $multipage, $more, $pagenow;
     if ( $more_file != '' )
         $file = $more_file;
@@ -252 +250 @@
 
 function wp_dropdown_pages($args = '') {
-    if ( is_array($args) )
-        $r = &$args;
-    else
-        parse_str($args, $r);
-
-    $defaults = array('depth' => 0, 'child_of' => 0, 'selected' => 0, 'echo' => 1,
-        'name' => 'page_id', 'show_option_none' => '');
-    $r = array_merge($defaults, $r);
-    extract($r);
+    $defaults = array(
+        'depth' => 0, 'child_of' => 0, 
+        'selected' => 0, 'echo' => 1, 
+        'name' => 'page_id', 'show_option_none' => ''
+    );
+    
+    $r = wp_parse_args( $args, $defaults );
+    extract( $r );
 
     $pages = get_pages($r);
@@ -282 +279 @@
 
 function wp_list_pages($args = '') {
-    if ( is_array($args) )
-        $r = &$args;
-    else
-        parse_str($args, $r);
-
-    $defaults = array('depth' => 0, 'show_date' => '', 'date_format' => get_option('date_format'),
-        'child_of' => 0, 'exclude' => '', 'title_li' => __('Pages'), 'echo' => 1, 'authors' => '', 'sort_column' => 'menu_order, post_title');
-    $r = array_merge($defaults, $r);
+    $defaults = array(
+        'depth' => 0, 'show_date' => '', 
+        'date_format' => get_option('date_format'), 
+        'child_of' => 0, 'exclude' => '', 
+        'title_li' => __('Pages'), 'echo' => 1, 
+        'authors' => '', 'sort_column' => 'menu_order, post_title'
+    );
+    
+    $r = wp_parse_args( $args, $defaults );
+    extract( $r );
 
     $output = '';