Changeset 3881

Timestamp:

06/17/2006 12:05:00 AM (19 years ago)

Author:

ryan

Message:

Use wp_list_categories() in templates.

Location:

trunk

Files:

• wp-content/themes/classic/sidebar.php (modified) (1 diff)
• wp-content/themes/default/sidebar.php (modified) (1 diff)
• wp-includes/category-template.php (modified) (3 diffs)
• wp-includes/deprecated.php (modified) (1 diff)

trunk/wp-content/themes/classic/sidebar.php

@@ -4 +4 @@
 
 <ul>
-    <?php wp_list_pages(); ?>
-    <?php wp_list_bookmarks(); ?>
- <li id="categories"><?php _e('Categories:'); ?>
-    <ul>
-    <?php wp_list_cats(); ?>
-    </ul>
- </li>
+    <?php wp_list_pages('title_li=' . __('Pages:')); ?>
+    <?php wp_list_bookmarks('title_after=&title_before='); ?>
+    <?php wp_list_categories('title_li=' . __('Categories:')); ?>
  <li id="search">
    <label for="s"><?php _e('Search:'); ?></label>

trunk/wp-content/themes/default/sidebar.php

@@ -47 +47 @@
             </li>
 
-            <li><h2>Categories</h2>
-                <ul>
-                <?php wp_list_cats('sort_column=name&optioncount=1&hierarchical=0'); ?>
-                </ul>
-            </li>
+            <?php wp_list_categories('sort_column=name&optioncount=1&hierarchical=0&title_li=<h2>Categories</h2>'); ?>
 
             <?php /* If this is the frontpage */ if ( is_home() || is_page() ) { ?>

trunk/wp-includes/category-template.php

@@ -213 +213 @@
         parse_str($args, $r);
 
-    $defaults = array('show_option_all' => '', 'orderby' => 'ID',
-        'order' => 'asc', 'style' => 'list', 'show_last_update' => 0,
+    $defaults = array('show_option_all' => '', 'orderby' => 'name',
+        'order' => 'ASC', 'show_last_update' => 0, 'style' => 'list',
         'show_count' => 0, 'hide_empty' => 1, 'use_desc_for_title' => 1,
         'child_of' => 0, 'feed' => '', 'feed_image' => '', 'exclude' => '',
-        'hierarchical' => true, 'title_li' => '');
+        'hierarchical' => true, 'title_li' => __('Categories'));
     $r = array_merge($defaults, $r);
     $r['include_last_update_time'] = $r['show_date'];
@@ -225 +225 @@
     
     $output = '';
-    if ( $title_li && $list )
+    if ( $title_li && 'list' == $style )
             $output = '<li class="categories">' . $r['title_li'] . '<ul>';
 
@@ -244 +244 @@
     }
 
-    if ( $title_li && $list )
+    if ( $title_li && 'list' == $style )
         $output .= '</ul></li>';
             

trunk/wp-includes/deprecated.php

@@ -431 +431 @@
     if ( !empty($r['list']) )
         $r['style'] = 'break';
+    $r['title_li'] = '';
 
     return wp_list_categories($r);