Merge with branches/2.5 in WordPress, revision 8066

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

4 files changed, 23 insertions, 6 deletions

diff --git a/wp-admin/includes/dashboard.php b/wp-admin/includes/dashboard.php
index ea88ee4..97fd26a 100644
--- a/wp-admin/includes/dashboard.php
+++ b/wp-admin/includes/dashboard.php
@@ -23,7 +23,9 @@ function wp_dashboard_setup() {
 	/* Register Widgets and Controls */
 
 	// Recent Comments Widget
-	if ( current_user_can( 'moderate_comments' ) && $mod_comments = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->comments WHERE comment_approved = '0'") ) {
+	$mod_comments = wp_count_comments();
+	$mod_comments = $mod_comments->moderated;
+	if ( current_user_can( 'moderate_comments' ) && $mod_comments ) {
 		$notice = sprintf( __ngettext( '%d comment awaiting moderation', '%d comments awaiting moderation', $mod_comments ), $mod_comments );
 		$notice = "<a href='edit-comments.php?comment_status=moderated'>$notice</a>";
 	} else {
diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php
index be70d92..0fb84bb 100644
--- a/wp-admin/includes/media.php
+++ b/wp-admin/includes/media.php
@@ -55,7 +55,7 @@ function get_image_send_to_editor($id, $alt, $title, $align, $url='', $rel = fal
 	$rel = $rel ? ' rel="attachment wp-att-'.attribute_escape($id).'"' : '';
 
 	if ( $url )
-		$html = "<a href='".attribute_escape($url)."'$rel>$html</a>";
+		$html = '<a href="' . clean_url($url) . "\"$rel>$html</a>";
 
 	$html = apply_filters( 'image_send_to_editor', $html, $id, $alt, $title, $align, $url, $size );
 
@@ -180,7 +180,7 @@ add_action( 'media_buttons', 'media_buttons' );
 function media_buttons_head() {
 $siteurl = get_option('siteurl');
 echo "<style type='text/css' media='all'>
-	@import '{$siteurl}/wp-includes/js/thickbox/thickbox.css?1';
+	@import '{$siteurl}/wp-includes/js/thickbox/thickbox.css?ver=20080430';
 	div#TB_title {
 		background-color: #222222;
 		color: #cfcfcf;
@@ -188,6 +188,9 @@ echo "<style type='text/css' media='all'>
 	div#TB_title a, div#TB_title a:visited {
 		color: #cfcfcf;
 	}
+	#TB_window {
+		top: 20px;
+	}
 </style>\n";
 }
 
@@ -791,6 +794,7 @@ jQuery(function($){
 			post_params : {
 				"post_id" : "<?php echo $post_id; ?>",
 				"auth_cookie" : "<?php echo $_COOKIE[AUTH_COOKIE]; ?>",
+				"_wpnonce" : "<?php echo wp_create_nonce('media-form'); ?>",
 				"type" : "<?php echo $type; ?>",
 				"tab" : "<?php echo $tab; ?>",
 				"short" : "1"
@@ -815,6 +819,7 @@ jQuery(function($){
 //-->
 </script>
 
+
 <div id="flash-upload-ui">
 <?php do_action('pre-flash-upload-ui'); ?>
 	<p><input id="flash-browse-button" type="button" value="<?php echo attribute_escape( __( 'Choose files to upload' ) ); ?>" class="button" /></p>
@@ -959,7 +964,6 @@ function media_upload_library_form($errors) {
 	<input type="submit" value="<?php echo attribute_escape( __( 'Search Media' ) ); ?>" class="button" />
 </div>
 
-<p>
 <ul class="subsubsub">
 <?php
 $type_links = array();
@@ -991,7 +995,6 @@ echo implode(' | </li>', $type_links) . '</li>';
 unset($type_links);
 ?>
 </ul>
-</p>
 
 <div class="tablenav">
 
@@ -1066,8 +1069,10 @@ jQuery(function($){
 <div id="media-items">
 <?php echo get_media_items(null, $errors); ?>
 </div>
+<p class="ml-submit">
 <input type="submit" class="button savebutton" name="save" value="<?php echo attribute_escape( __( 'Save all changes' ) ); ?>" />
 <input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
+</p>
 </form>
 <?php
 }
diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php
index 94bdbd3..800a86d 100644
--- a/wp-admin/includes/upgrade.php
+++ b/wp-admin/includes/upgrade.php
@@ -205,6 +205,9 @@ function upgrade_all() {
 	if ( $wp_current_db_version < 7796 )
 		upgrade_251();
 
+	if ( $wp_current_db_version < 7935 )
+		upgrade_252();
+
 	maybe_disable_automattic_widgets();
 
 	$wp_rewrite->flush_rules();
@@ -747,6 +750,12 @@ function upgrade_251() {
 	update_option('secret', wp_generate_password(64));
 }
 
+function upgrade_252() {
+	global $wpdb;
+
+	$wpdb->query("UPDATE $wpdb->users SET user_activation_key = ''");
+}
+
 // The functions we use to actually do stuff
 
 // General
diff --git a/wp-admin/includes/widgets.php b/wp-admin/includes/widgets.php
index 641f80f..09936b7 100644
--- a/wp-admin/includes/widgets.php
+++ b/wp-admin/includes/widgets.php
@@ -227,6 +227,7 @@ function wp_widget_control( $sidebar_args ) {
 	if ( empty($sidebar_args['_display']) || 'template' != $sidebar_args['_display'] )
 		echo $sidebar_args['before_widget'];
 ?>
+		<div class="widget-top">
 		<h4 class="widget-title"><?php echo $widget_title ?>
 
 			<?php if ( $edit ) : ?>
@@ -239,7 +240,7 @@ function wp_widget_control( $sidebar_args ) {
 
 			<?php endif; ?>
 
-		</h4>
+		</h4></div>
 
 		<div class="widget-control"<?php if ( $edit ) echo ' style="display: block;"'; ?>>