<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[21153] branches/3.4: Add a check that previously fell through to the next branch in map_meta_cap().</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/21153">21153</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-06-27 19:29:16 +0000 (Wed, 27 Jun 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a check that previously fell through to the next branch in map_meta_cap(). for 3.4.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches34wpadminaboutphp">branches/3.4/wp-admin/about.php</a></li>
<li><a href="#branches34wpincludescapabilitiesphp">branches/3.4/wp-includes/capabilities.php</a></li>
<li><a href="#branches34wpincludesversionphp">branches/3.4/wp-includes/version.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches34wpadminaboutphp"></a>
<div class="modfile"><h4>Modified: branches/3.4/wp-admin/about.php (21152 => 21153)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.4/wp-admin/about.php 2012-06-27 19:27:54 UTC (rev 21152)
+++ branches/3.4/wp-admin/about.php 2012-06-27 19:29:16 UTC (rev 21153)
</span><span class="lines">@@ -33,6 +33,14 @@
</span><span class="cx"> </a>
</span><span class="cx"> </h2>
</span><span class="cx">
</span><ins>+<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>
+
</ins><span class="cx"> <div class="changelog">
</span><span class="cx"> <h3><?php _e( 'Live Theme Previews' ); ?></h3>
</span><span class="cx">
</span></span></pre></div>
<a id="branches34wpincludescapabilitiesphp"></a>
<div class="modfile"><h4>Modified: branches/3.4/wp-includes/capabilities.php (21152 => 21153)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.4/wp-includes/capabilities.php 2012-06-27 19:27:54 UTC (rev 21152)
+++ branches/3.4/wp-includes/capabilities.php 2012-06-27 19:29:16 UTC (rev 21153)
</span><span class="lines">@@ -1130,6 +1130,8 @@
</span><span class="cx"> // Disallow unfiltered_html for all users, even admins and super admins.
</span><span class="cx"> if ( defined( 'DISALLOW_UNFILTERED_HTML' ) && DISALLOW_UNFILTERED_HTML )
</span><span class="cx"> $caps[] = 'do_not_allow';
</span><ins>+ elseif ( is_multisite() && ! is_super_admin( $user_id ) )
+ $caps[] = $cap;
</ins><span class="cx"> else
</span><span class="cx"> $caps[] = $cap;
</span><span class="cx"> break;
</span></span></pre></div>
<a id="branches34wpincludesversionphp"></a>
<div class="modfile"><h4>Modified: branches/3.4/wp-includes/version.php (21152 => 21153)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.4/wp-includes/version.php 2012-06-27 19:27:54 UTC (rev 21152)
+++ branches/3.4/wp-includes/version.php 2012-06-27 19:29:16 UTC (rev 21153)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @global string $wp_version
</span><span class="cx"> */
</span><del>-$wp_version = '3.4.1-RC1';
</del><ins>+$wp_version = '3.4.1';
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
</span></span></pre>
</div>
</div>
</body>
</html>