From f5df7e19ad5ea422ccbf7e1973a89ce19c279c10 Mon Sep 17 00:00:00 2001
From: nacin <nacin@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Wed, 27 Jun 2012 19:29:16 +0000
Subject: [PATCH] Add a check that previously fell through to the next branch
 in map_meta_cap(). for 3.4.

git-svn-id: http://core.svn.wordpress.org/branches/3.4@21153 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/about.php           | 8 ++++++++
 wp-includes/capabilities.php | 2 ++
 wp-includes/version.php      | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/wp-admin/about.php b/wp-admin/about.php
index 3fa52e7912d..4ffd837e09c 100644
--- a/wp-admin/about.php
+++ b/wp-admin/about.php
@@ -33,6 +33,14 @@
 	</a>
 </h2>
 
+<div class="changelog point-releases">
+	<h3><?php echo _n( 'Maintenance and Security Release', 'Maintenance and Security Releases', 1 ); ?></h3>
+	<p><?php printf( _n( '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bug.',
+         '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.', 21 ), '3.4.1', number_format_i18n( 21 ) ); ?>
+		<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'http://codex.wordpress.org/Version_3.4.1' ); ?>
+ 	</p>
+</div>
+
 <div class="changelog">
 	<h3><?php _e( 'Live Theme Previews' ); ?></h3>
 
diff --git a/wp-includes/capabilities.php b/wp-includes/capabilities.php
index d77cfea8e81..ca95c2345fd 100644
--- a/wp-includes/capabilities.php
+++ b/wp-includes/capabilities.php
@@ -1130,6 +1130,8 @@ function map_meta_cap( $cap, $user_id ) {
 		// Disallow unfiltered_html for all users, even admins and super admins.
 		if ( defined( 'DISALLOW_UNFILTERED_HTML' ) && DISALLOW_UNFILTERED_HTML )
 			$caps[] = 'do_not_allow';
+		elseif ( is_multisite() && ! is_super_admin( $user_id ) )
+			$caps[] = $cap;
 		else
 			$caps[] = $cap;
 		break;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 2d0446a1925..016686cf433 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '3.4.1-RC1';
+$wp_version = '3.4.1';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.