Wordpress 2.3.2

[autoinstalls/wordpress.git] / wp-content / themes / default / sidebar.php

diff --git a/wp-content/themes/default/sidebar.php b/wp-content/themes/default/sidebar.php
index 46d8ddddb3aceef8664ebe9cec897023376684d1..36dea86f62bb0751793a18303ff8bffc9283a344 100644 (file)
--- a/wp-content/themes/default/sidebar.php
+++ b/wp-content/themes/default/sidebar.php
@@ -1,6 +1,7 @@
        <div id="sidebar">
                <ul>
-
+                       <?php   /* Widgetized sidebar, if you have the plugin installed. */
+                                       if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar() ) : ?>
                        <li>
                                <?php include (TEMPLATEPATH . '/searchform.php'); ?>
                        </li>
@@ -11,32 +12,36 @@
                        </li>
                        -->
 
-                       <li>
+                       <?php if ( is_404() || is_category() || is_day() || is_month() ||
+                                               is_year() || is_search() || is_paged() ) {
+                       ?> <li>
+
                        <?php /* If this is a 404 page */ if (is_404()) { ?>
                        <?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
+                       <p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> blog 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
+                       <p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> blog archives
                        for <?php the_time('F, Y'); ?>.</p>
 
-      <?php /* If this is a yearly archive */ } elseif (is_year()) { ?>
-                       <p>You are currently browsing the <a href="<?php bloginfo('home'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives
+                       <?php /* If this is a yearly archive */ } elseif (is_year()) { ?>
+                       <p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> blog 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 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 (is_search()) { ?>
+                       <p>You have searched the <a href="<?php echo bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> blog 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>
 
                        <?php /* If this is a monthly archive */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?>
-                       <p>You are currently browsing the <a href="<?php echo bloginfo('home'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives.</p>
+                       <p>You are currently browsing the <a href="<?php echo bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> blog archives.</p>
 
                        <?php } ?>
-                       </li>
+
+                       </li> <?php }?>
 
                        <?php wp_list_pages('title_li=<h2>Pages</h2>' ); ?>
 
@@ -46,14 +51,10 @@
                                </ul>
                        </li>
 
-                       <li><h2>Categories</h2>
-                               <ul>
-                               <?php wp_list_cats('sort_column=name&optioncount=1&hierarchical=0'); ?>
-                               </ul>
-                       </li>
+                       <?php wp_list_categories('show_count=1&title_li=<h2>Categories</h2>'); ?>
 
                        <?php /* If this is the frontpage */ if ( is_home() || is_page() ) { ?>
-                               <?php get_links_list(); ?>
+                               <?php wp_list_bookmarks(); ?>
 
                                <li><h2>Meta</h2>
                                <ul>
@@ -67,6 +68,7 @@
                                </li>
                        <?php } ?>
 
+                       <?php endif; ?>
                </ul>
        </div>