Changeset 21153

Timestamp:

06/27/2012 07:29:16 PM (13 years ago)

Author:

nacin

Message:

Add a check that previously fell through to the next branch in map_meta_cap(). for 3.4.

Location:

branches/3.4

Files:

• wp-admin/about.php (modified) (1 diff)
• wp-includes/capabilities.php (modified) (1 diff)
• wp-includes/version.php (modified) (1 diff)

branches/3.4/wp-admin/about.php

@@ -33 +33 @@
     </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">

branches/3.4/wp-includes/capabilities.php

@@ -1131 +1131 @@
         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;

branches/3.4/wp-includes/version.php

@@ -5 +5 @@
  * @global string $wp_version
  */
-$wp_version = '3.4.1-RC1';
+$wp_version = '3.4.1';
 
 /**