From 18fb540124995aca149ee86373df7f3e8db34e68 Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Thu, 29 May 2008 23:16:11 +0000
Subject: [PATCH] Validation fixes for post revisions. Props mdawaffe. see
 #6775

git-svn-id: http://svn.automattic.com/wordpress/trunk@8012 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/css/colors-classic.css |  2 +-
 wp-admin/css/colors-fresh.css   |  2 +-
 wp-admin/revision.php           | 10 ++++++++--
 wp-admin/wp-admin.css           |  5 ++++-
 wp-includes/post-template.php   |  6 +++++-
 5 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/wp-admin/css/colors-classic.css b/wp-admin/css/colors-classic.css
index b733ab698..53c46fb1c 100644
--- a/wp-admin/css/colors-classic.css
+++ b/wp-admin/css/colors-classic.css
@@ -2,7 +2,7 @@ a.page-numbers:hover {
 	border-color: #999;
 }
 
-body, .form-table pre {
+body, .form-table .pre {
 	background-color: #fff;
 	color: #333;
 }
diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css
index 1197564ac..fb76609a5 100644
--- a/wp-admin/css/colors-fresh.css
+++ b/wp-admin/css/colors-fresh.css
@@ -2,7 +2,7 @@ a.page-numbers:hover {
 	border-color: #999;
 }
 
-body, .form-table pre {
+body, .form-table .pre {
 	background-color: #fff;
 	color: #333;
 }
diff --git a/wp-admin/revision.php b/wp-admin/revision.php
index f7f627569..a00fa8153 100644
--- a/wp-admin/revision.php
+++ b/wp-admin/revision.php
@@ -146,7 +146,7 @@ require_once( 'admin-header.php' );
 	<th scope="col" class="th-full">
 		<span class="alignleft"><?php printf( __('Older: %s'), wp_post_revision_title( $left_revision ) ); ?></span>
 		<span class="alignright"><?php printf( __('Newer: %s'), wp_post_revision_title( $right_revision ) ); ?></span>
-	</td>
+	</th>
 </tr>
 <?php endif;
 
@@ -167,7 +167,7 @@ foreach ( _wp_post_revision_fields() as $field => $field_title ) :
 
 	<tr id="revision-field-<?php echo $field; ?>">
 		<th scope="row"><?php echo wp_specialchars( $field_title ); ?></th>
-		<td><pre><?php echo $content; ?></pre></td>
+		<td><div class="pre"><?php echo $content; ?></div></td>
 	</tr>
 
 	<?php
@@ -200,4 +200,10 @@ if ( !constant( 'WP_POST_REVISIONS' ) )
 
 wp_list_post_revisions( $post, $args );
 
+?>
+
+</div>
+
+<?php
+
 require_once( 'admin-footer.php' );
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index 5fda0ccd1..283c3deff 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -927,9 +927,12 @@ html, body {
 	margin-right: 5px
 }
 
-.form-table pre {
+.form-table .pre {
 	padding: 8px;
 	margin: 0;
+}
+
+.pre {
 	/* http://www.longren.org/2006/09/27/wrapping-text-inside-pre-tags/ */
 	white-space: pre-wrap; /* css-3 */
 	white-space: -moz-pre-wrap !important; /* Mozilla, since 1999 */
diff --git a/wp-includes/post-template.php b/wp-includes/post-template.php
index 30bf02628..40a56d99e 100644
--- a/wp-includes/post-template.php
+++ b/wp-includes/post-template.php
@@ -677,7 +677,7 @@ function wp_list_post_revisions( $post_id = 0, $args = null ) { // TODO? split i
 				$actions = '';
 
 			$rows .= "<tr$class>\n";
-			$rows .= "\t<th style='white-space: nowrap' scope='row'><input type='radio' name='left' value='$revision->ID'$left_checked /><input type='radio' name='right' value='$revision->ID'$right_checked />\n";
+			$rows .= "\t<th style='white-space: nowrap' scope='row'><input type='radio' name='left' value='$revision->ID'$left_checked /><input type='radio' name='right' value='$revision->ID'$right_checked /></th>\n";
 			$rows .= "\t<td>$date</td>\n";
 			$rows .= "\t<td>$name</td>\n";
 			$rows .= "\t<td class='action-links'>$actions</td>\n";
@@ -707,10 +707,12 @@ function wp_list_post_revisions( $post_id = 0, $args = null ) { // TODO? split i
 	<col style="width: 33%" />
 	<col style="width: 33%" />
 <thead>
+<tr>
 	<th scope="col"></th>
 	<th scope="col"><?php _e( 'Date Created' ); ?></th>
 	<th scope="col"><?php _e( 'Author' ); ?></th>
 	<th scope="col" class="action-links"><?php _e( 'Actions' ); ?></th>
+</tr>
 </thead>
 <tbody>
 
@@ -719,6 +721,8 @@ function wp_list_post_revisions( $post_id = 0, $args = null ) { // TODO? split i
 </tbody>
 </table>
 
+</form>
+
 <?php
 	else :
 		echo "<ul class='post-revisions'>\n";