WP Merge with revision 8075

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

4 files changed, 8 insertions, 3 deletions

diff --git a/wp-content/themes/default/comments.php b/wp-content/themes/default/comments.php
index 08b1be1..ec2f6c4 100644
--- a/wp-content/themes/default/comments.php
+++ b/wp-content/themes/default/comments.php
@@ -78,10 +78,10 @@
 
 <?php else : ?>
 
-<p><input type="text" name="author" id="author" value="<?php echo $comment_author; ?>" size="22" tabindex="1" />
+<p><input type="text" name="author" id="author" value="<?php echo $comment_author; ?>" size="22" tabindex="1" <?php if ($req) echo "aria-required='true'"; ?> />
 <label for="author"><small>Name <?php if ($req) echo "(required)"; ?></small></label></p>
 
-<p><input type="text" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="22" tabindex="2" />
+<p><input type="text" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="22" tabindex="2" <?php if ($req) echo "aria-required='true'"; ?> />
 <label for="email"><small>Mail (will not be published) <?php if ($req) echo "(required)"; ?></small></label></p>
 
 <p><input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="22" tabindex="3" />
diff --git a/wp-content/themes/default/searchform.php b/wp-content/themes/default/searchform.php
index 2282083..300a1c4 100644
--- a/wp-content/themes/default/searchform.php
+++ b/wp-content/themes/default/searchform.php
@@ -1,4 +1,5 @@
 <form method="get" id="searchform" action="<?php bloginfo('url'); ?>/">
+<label class="hidden" for="s"><?php _e('Search for:'); ?></label>
 <div><input type="text" value="<?php the_search_query(); ?>" name="s" id="s" />
 <input type="submit" id="searchsubmit" value="Search" />
 </div>
diff --git a/wp-content/themes/default/single.php b/wp-content/themes/default/single.php
index 313b52e..b3bf786 100644
--- a/wp-content/themes/default/single.php
+++ b/wp-content/themes/default/single.php
@@ -45,7 +45,7 @@
 							// Neither Comments, nor Pings are open ?>
 							Both comments and pings are currently closed.
 
-						<?php } edit_post_link('Edit this entry.','',''); ?>
+						<?php } edit_post_link('Edit this entry','','.'); ?>
 
 					</small>
 				</p>
diff --git a/wp-content/themes/default/style.css b/wp-content/themes/default/style.css
index 3641f37..b927278 100644
--- a/wp-content/themes/default/style.css
+++ b/wp-content/themes/default/style.css
@@ -616,6 +616,10 @@ blockquote cite {
 	text-align: center;
 	}
 
+.hidden {
+	display: none;
+	}
+
 hr {
 	display: none;
 	}