--- wordpress/wp-content/themes/default/sidebar.php	Thu Jan 27 17:26:58 2005
+++ /usr/local/www/data/wp/wp-content/themes/default/sidebar.php	Sat Jan 29 01:22:09 2005
@@ -20,19 +20,21 @@
 			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 echo get_settings('siteurl'); ?>"><?php echo bloginfo('name'); ?></a> weblog archives
-			for <?php the_time('F, Y'); ?>.</p>
+			<?php printf('<p>You are currently browsing the <a href="%s">%s</a> weblog archives
+				for %s.</p>',get_settings('siteurl'), get_bloginfo('name'), get_the_time('F, Y')); ?>
 
       <?php /* If this is a yearly archive */ } elseif (is_year()) { ?>
-			<p>You are currently browsing the <a href="<?php echo get_settings('siteurl'); ?>"><?php echo bloginfo('name'); ?></a> weblog archives
-			for the year <?php the_time('Y'); ?>.</p>
+			<?php printf('<p>You are currently browsing the <a href="%s">%s</a> weblog archives
+			for the year %s.</p>', get_settings('siteurl'), get_bloginfo('name'), get_the_time('Y')); ?>
+
 			
-		 <?php /* If this is a monthly archive */ } elseif (is_search()) { ?>
-			<p>You have searched the <a href="<?php echo get_settings('siteurl'); ?>"><?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 search results page */ } elseif (is_search()) { ?>
+			<?php printf('<p>You have searched the <a href="%s">%s</a> weblog archives
+				for <strong>\'%s\'</strong>. If you are unable to find anything in these search results, you can try one of these links.</p>', get_settings('siteurl'), get_bloginfo('name'), wp_specialchars($s)); ?>
+
+			<?php /* If we are moving through pages */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?>
+			<?php printf('<p>You are currently browsing the <a href="%s">%s</a> weblog archives.</p>', get_settings('siteurl'), get_bloginfo('name')); ?>
 
-			<?php /* If this is a monthly archive */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?>
-			<p>You are currently browsing the <a href="<?php echo get_settings('siteurl'); ?>"><?php echo bloginfo('name'); ?></a> weblog archives.</p>
 
 			<?php } ?>
 			</li>