mirror_php/wordpress
1
0
Fork 0
mirror of git://develop.git.wordpress.org/ synced 2025-07-16 21:21:17 +02:00
Code Issues Actions 76 Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/branches/3.4@21153 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Nacin
2012-06-27 19:29:16 +00:00
parent d17488b150
commit 15c02b4538
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wp-admin/about.php
View File

@@ -33,6 +33,14 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
</a> </a>
</h2> </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"> <div class="changelog">
<h3><?php _e( 'Live Theme Previews' ); ?></h3> <h3><?php _e( 'Live Theme Previews' ); ?></h3>

2
wp-includes/capabilities.php
View File

@@ -1130,6 +1130,8 @@ function map_meta_cap( $cap, $user_id ) {
// Disallow unfiltered_html for all users, even admins and super admins. // Disallow unfiltered_html for all users, even admins and super admins.
if ( defined( 'DISALLOW_UNFILTERED_HTML' ) && DISALLOW_UNFILTERED_HTML ) if ( defined( 'DISALLOW_UNFILTERED_HTML' ) && DISALLOW_UNFILTERED_HTML )
$caps[] = 'do_not_allow'; $caps[] = 'do_not_allow';
elseif ( is_multisite() && ! is_super_admin( $user_id ) )
$caps[] = $cap;
else else
$caps[] = $cap; $caps[] = $cap;
break; break;

2
wp-includes/version.php
View File

@@ -4,7 +4,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.