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 @@
+
+
+
Version %1$s addressed some security issues and fixed %2$s bug.',
+ 'Version %1$s addressed some security issues and fixed %2$s bugs.', 21 ), '3.4.1', number_format_i18n( 21 ) ); ?>
+ the release notes.' ), 'http://codex.wordpress.org/Version_3.4.1' ); ?>
+
+
+
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.