WP Merge to 4578, except for script-loader

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@817 7be80a69-a1ef-0310-a953-fb0f7c49ff36

2 files changed, 7 insertions, 3 deletions

diff --git a/wp-content/themes/default/archive.php b/wp-content/themes/default/archive.php
index c6acaab..f5881f8 100644
--- a/wp-content/themes/default/archive.php
+++ b/wp-content/themes/default/archive.php
@@ -6,7 +6,7 @@
 
 		 <?php $post = $posts[0]; // Hack. Set $post so that the_date() works. ?>
 <?php /* If this is a category archive */ if (is_category()) { ?>
-		<h2 class="pagetitle">Archive for the '<?php echo single_cat_title(); ?>' Category</h2>
+		<h2 class="pagetitle">Archive for the &#8216;<?php echo single_cat_title(); ?>&#8217; Category</h2>
 
  	  <?php /* If this is a daily archive */ } elseif (is_day()) { ?>
 		<h2 class="pagetitle">Archive for <?php the_time('F jS, Y'); ?></h2>
@@ -40,7 +40,7 @@
 					<?php the_content() ?>
 				</div>
 
-				<p class="postmetadata">Posted in <?php the_category(', ') ?> | <?php edit_post_link('Edit', '', ' | '); ?>  <?php comments_popup_link('No Comments &#187;', '1 Comment &#187;', '% Comments &#187;'); ?></p> 
+				<p class="postmetadata">Posted in <?php the_category(', ') ?> | <?php edit_post_link('Edit', '', ' | '); ?>  <?php comments_popup_link('No Comments &#187;', '1 Comment &#187;', '% Comments &#187;'); ?></p>
 
 			</div>
 
diff --git a/wp-content/themes/default/style.css b/wp-content/themes/default/style.css
index a88d974..74cb721 100644
--- a/wp-content/themes/default/style.css
+++ b/wp-content/themes/default/style.css
@@ -186,7 +186,7 @@ a:hover {
 	text-decoration: underline;
 	}
 
-#wp-calendar #prev a {
+#wp-calendar #prev a, #wp-calendar #next a {
 	font-size: 9pt;
 	}
 
@@ -253,6 +253,10 @@ body {
 	text-align: justify;
 	}
 
+.post hr {
+	display: block;
+	}
+
 .widecolumn .post {
 	margin: 0;
 	}