summaryrefslogtreecommitdiffstats
path: root/wp-content/themes/default/sidebar.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2007-05-21 18:37:58 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2007-05-21 18:37:58 +0000
commit89fe0ff804e7c6497ebacc8b341ac89974f6f255 (patch)
tree3fce310b29c685008fdbb75c5ab531bc3a6ae12a /wp-content/themes/default/sidebar.php
parenta139071806ba941346a109fbefb2d5f22bae1cc4 (diff)
WP Merge to rev 5499, this is a big one! Test it before you put it live!
Test only, not for production use yet git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@972 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-content/themes/default/sidebar.php')
-rw-r--r--wp-content/themes/default/sidebar.php14
1 files changed, 10 insertions, 4 deletions
diff --git a/wp-content/themes/default/sidebar.php b/wp-content/themes/default/sidebar.php
index 6834dbc..0fdccda 100644
--- 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() ) : ?>
<?php if ( function_exists('dynamic_sidebar') && dynamic_sidebar() ) : ?>
</ul>
@@ -19,7 +20,10 @@
</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>
@@ -44,7 +48,8 @@
<p>You are currently browsing the <a href="<?php echo bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives.</p>
<?php } ?>
- </li>
+
+ </li> <?php }?>
<?php wp_list_pages('title_li=<h2>Pages</h2>' ); ?>
@@ -73,7 +78,8 @@
</ul>
</li>
<?php } ?>
-
+
+ <?php endif; ?>
</ul>
</div>