Changes in trunk/wp-content/themes/default/sidebar.php [4171:3134]

File:

• trunk/wp-content/themes/default/sidebar.php (modified) (5 diffs)

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

@@ -1 +1 @@
         <div id="sidebar">
                 <ul>
-
+                        
                         <li>
                                 <?php include (TEMPLATEPATH . '/searchform.php'); ?>
@@ -16 +16 @@
                         <?php /* If this is a category archive */ } elseif (is_category()) { ?>
                         <p>You are currently browsing the archives for the <?php single_cat_title(''); ?> category.</p>
-
+                        
                         <?php /* If this is a yearly archive */ } elseif (is_day()) { ?>
                         <p>You are currently browsing the <a href="<?php bloginfo('home'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives
                         for the day <?php the_time('l, F jS, Y'); ?>.</p>
-
+                        
                         <?php /* If this is a monthly archive */ } elseif (is_month()) { ?>
                         <p>You are currently browsing the <a href="<?php bloginfo('home'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives
@@ -28 +28 @@
                         <p>You are currently browsing the <a href="<?php bloginfo('home'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives
                         for the year <?php the_time('Y'); ?>.</p>
-
+                        
                  <?php /* If this is a monthly archive */ } elseif (is_search()) { ?>
                         <p>You have searched the <a href="<?php echo bloginfo('home'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives
-                        for <strong>'<?php the_search_query(); ?>'</strong>. If you are unable to find anything in these search results, you can try one of these links.</p>
+                        for <strong>'<?php echo wp_specialchars($s); ?>'</strong>. If you are unable to find anything in these search results, you can try one of these links.</p>
 
                         <?php /* If this is a monthly archive */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?>
@@ -47 +47 @@
                         </li>
 
-                        <?php wp_list_categories('optioncount=1&hierarchical=0&title_li=<h2>Categories</h2>'); ?>
+                        <li><h2>Categories</h2>
+                                <ul>
+                                <?php wp_list_cats('sort_column=name&optioncount=1&hierarchical=0'); ?>
+                                </ul>
+                        </li>
 
-                        <?php /* If this is the frontpage */ if ( is_home() || is_page() ) { ?>
-                                <?php wp_list_bookmarks(); ?>
-
+                        <?php /* If this is the frontpage */ if ( is_home() || is_page() ) { ?>                         
+                                <?php get_links_list(); ?>
+                                
                                 <li><h2>Meta</h2>
                                 <ul>
@@ -63 +67 @@
                                 </li>
                         <?php } ?>
-
+                        
                 </ul>
         </div>