From a687ece1a8300fd73f2952098cd4a78689501dd6 Mon Sep 17 00:00:00 2001
From: Andrew Nacin <nacin@git.wordpress.org>
Date: Wed, 12 May 2010 19:29:35 +0000
Subject: [PATCH] Don't nest p tag inside the opening table tag in the new
 right now box. fixes IE display, and validation. fixes #12202, props ocean90.

git-svn-id: https://develop.svn.wordpress.org/trunk@14582 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/css/ms.css             | 2 +-
 wp-admin/css/ms.dev.css         | 1 +
 wp-admin/includes/dashboard.php | 8 ++++----
 wp-includes/script-loader.php   | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/wp-admin/css/ms.css b/wp-admin/css/ms.css
index 00bce370bc..8d75fb5d28 100644
--- a/wp-admin/css/ms.css
+++ b/wp-admin/css/ms.css
@@ -1 +1 @@
-#dashboard_right_now p.musub{margin-top:12px;border-top:1px solid #ececec;position:static;}#dashboard_right_now td.b a.musublink{font-size:16px;}#dashboard_right_now div.musubtable{border-top:none;}.ms-sites-php .postbox h3{cursor:auto;}.ms-sites-php .postbox .description{margin:10px 0 0;padding:0 10px 10px;border-bottom:1px solid #DFDFDF;}tr.site-deleted{background:#ff8573;}tr.site-spammed{background:#faa;}tr.site-archived{background:#ffebe8;}tr.site-mature{background:#fecac2;}
\ No newline at end of file
+#dashboard_right_now p.musub{margin-top:12px;border-top:1px solid #ececec;padding-left:16px;position:static;}#dashboard_right_now td.b a.musublink{font-size:16px;}#dashboard_right_now div.musubtable{border-top:none;}.ms-sites-php .postbox h3{cursor:auto;}.ms-sites-php .postbox .description{margin:10px 0 0;padding:0 10px 10px;border-bottom:1px solid #DFDFDF;}tr.site-deleted{background:#ff8573;}tr.site-spammed{background:#faa;}tr.site-archived{background:#ffebe8;}tr.site-mature{background:#fecac2;}
\ No newline at end of file
diff --git a/wp-admin/css/ms.dev.css b/wp-admin/css/ms.dev.css
index 4b2b797099..cef0b2c19d 100644
--- a/wp-admin/css/ms.dev.css
+++ b/wp-admin/css/ms.dev.css
@@ -2,6 +2,7 @@
 #dashboard_right_now p.musub {
 	margin-top: 12px;
 	border-top: 1px solid #ececec;
+	padding-left: 16px;
 	position: static;
 }
 
diff --git a/wp-admin/includes/dashboard.php b/wp-admin/includes/dashboard.php
index 84055f283d..8738231b98 100644
--- a/wp-admin/includes/dashboard.php
+++ b/wp-admin/includes/dashboard.php
@@ -215,8 +215,8 @@ function wp_dashboard_right_now() {
 
 	$num_comm = wp_count_comments( );
 
-	echo "\n\t".'<div class="table table_content">'."\n\t".'<table>';
-	echo "\n\t".'<p class="sub">' . __('Content') . '</p>';
+	echo "\n\t".'<div class="table table_content">';
+	echo "\n\t".'<p class="sub">' . __('Content') . '</p>'."\n\t".'<table>';
 	echo "\n\t".'<tr class="first">';
 
 	// Posts
@@ -286,8 +286,8 @@ function wp_dashboard_right_now() {
 	echo "\n\t</table>\n\t</div>";
 
 
-	echo "\n\t".'<div class="table table_discussion">'."\n\t".'<table>';
-	echo "\n\t".'<p class="sub">' . __('Discussion') . '</p>';
+	echo "\n\t".'<div class="table table_discussion">';
+	echo "\n\t".'<p class="sub">' . __('Discussion') . '</p>'."\n\t".'<table>';
 	echo "\n\t".'<tr class="first">';
 
 	// Total Comments
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index c1d742cae3..e64f978d1b 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -461,7 +461,7 @@ function wp_default_styles( &$styles ) {
 	$styles->add( 'colors-classic', "/wp-admin/css/colors-classic$suffix.css", array(), $colors_version );
 	$styles->add_data( 'colors-classic', 'rtl', true );
 
-	$styles->add( 'ms', "/wp-admin/css/ms$suffix.css", array(), '20100406' );
+	$styles->add( 'ms', "/wp-admin/css/ms$suffix.css", array(), '20100512' );
 	$styles->add( 'global', "/wp-admin/css/global$suffix.css", array(), '20100108' );
 	$styles->add( 'media', "/wp-admin/css/media$suffix.css", array(), '20091029' );
 	$styles->add( 'widgets', "/wp-admin/css/widgets$suffix.css", array(), '20091118' );