Ticket #4969: 4969.patch

wp-includes/post-template.php

@@ -304 +304 @@
                 'date_format' => get_option('date_format'),
                 'child_of' => 0, 'exclude' => '',
                 'title_li' => __('Pages'), 'echo' => 1,
-                'authors' => '', 'sort_column' => 'menu_order, post_title'
+                'authors' => '', 'sort_column' => 'menu_order, post_title',
+                'before' => '<li class="pagenav">', 'after' => '</li>'
         );
 
         $r = wp_parse_args( $args, $defaults );
@@ -325 +326 @@
 
         if ( !empty($pages) ) {
                 if ( $r['title_li'] )
-                        $output .= '<li class="pagenav">' . $r['title_li'] . '<ul>';
+                        $output .= $r['before'] . $r['title_li'] . '<ul>';
 
                 global $wp_query;
                 if ( is_page() || $wp_query->is_posts_page )
@@ -333 +334 @@
                 $output .= walk_page_tree($pages, $r['depth'], $current_page, $r);
 
                 if ( $r['title_li'] )
-                        $output .= '</ul></li>';
+                        $output .= '</ul>'. $r['after'];
         }
 
         $output = apply_filters('wp_list_pages', $output);

wp-includes/general-template.php

@@ -359 +359 @@
         $defaults = array(
                 'type' => 'monthly', 'limit' => '',
                 'format' => 'html', 'before' => '',
-                'after' => '', 'show_post_count' => false
+                'after' => '', 'show_post_count' => false,
+                'title_li' => '' , 'before' => '', 
+                'after' => ''
         );
-
+        
         $r = wp_parse_args( $args, $defaults );
         extract( $r, EXTR_SKIP );
 
+        if ( $r[$before] )
+                        echo $r[$before];
+        if ( $r['title_li'] )
+            $r['title_li'] . '<ul>';
+
         if ( '' == $type )
                 $type = 'monthly';
 
@@ -516 +523 @@
                         }
                 }
         }
+        if ( $r['title_li'] )
+                echo '</ul>';
+        if ( $r['after'])
+                $r['after'];
 }