<!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>[47357] trunk: Posts, Post Types: Ensure `delete_posts` is included in default post type capabilities regardless of `map_meta_cap` value.</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 { white-space: pre-line; 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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/47357">47357</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/47357","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-02-25 12:48:11 +0000 (Tue, 25 Feb 2020)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Posts, Post Types: Ensure `delete_posts` is included in default post type capabilities regardless of `map_meta_cap` value.
This resolves PHP notices in a few places in core where this capability is checked.
Props Mte90, johnbillion, dipesh.kakadiya, jipmoors, bamadesigner, dd32, johnjamesjacoby, xedin.unknown, flixos90, SergeyBiryukov.
Fixes <a href="https://core.trac.wordpress.org/ticket/30991">#30991</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludespostphp">trunk/src/wp-includes/post.php</a></li>
<li><a href="#trunktestsphpunittestsusermapMetaCapphp">trunk/tests/phpunit/tests/user/mapMetaCap.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludespostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/post.php 2020-02-25 11:12:18 UTC (rev 47356)
+++ trunk/src/wp-includes/post.php 2020-02-25 12:48:11 UTC (rev 47357)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1509,7 +1509,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Otherwise, an 's' will be added to the value for the plural form. After
</span><span class="cx" style="display: block; padding: 0 10px"> * registration, capability_type will always be a string of the singular value.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * By default, seven keys are accepted as part of the capabilities array:
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * By default, eight keys are accepted as part of the capabilities array:
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * - edit_post, read_post, and delete_post are meta capabilities, which are then
</span><span class="cx" style="display: block; padding: 0 10px"> * generally mapped to corresponding primitive capabilities depending on the
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1521,17 +1521,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * - edit_others_posts - Controls whether objects of this type owned by other users
</span><span class="cx" style="display: block; padding: 0 10px"> * can be edited. If the post type does not support an author, then this will
</span><span class="cx" style="display: block; padding: 0 10px"> * behave like edit_posts.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * - delete_posts - Controls whether objects of this post type can be deleted.
</ins><span class="cx" style="display: block; padding: 0 10px"> * - publish_posts - Controls publishing objects of this post type.
</span><span class="cx" style="display: block; padding: 0 10px"> * - read_private_posts - Controls whether private objects can be read.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * These four primitive capabilities are checked in core in various locations.
- * There are also seven other primitive capabilities which are not referenced
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * These five primitive capabilities are checked in core in various locations.
+ * There are also six other primitive capabilities which are not referenced
</ins><span class="cx" style="display: block; padding: 0 10px"> * directly in core, except in map_meta_cap(), which takes the three aforementioned
</span><span class="cx" style="display: block; padding: 0 10px"> * meta capabilities and translates them into one or more primitive capabilities
</span><span class="cx" style="display: block; padding: 0 10px"> * that must then be checked against the user or role, depending on the context.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * - read - Controls whether objects of this post type can be read.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * - delete_posts - Controls whether objects of this post type can be deleted.
</del><span class="cx" style="display: block; padding: 0 10px"> * - delete_private_posts - Controls whether private objects can be deleted.
</span><span class="cx" style="display: block; padding: 0 10px"> * - delete_published_posts - Controls whether published objects can be deleted.
</span><span class="cx" style="display: block; padding: 0 10px"> * - delete_others_posts - Controls whether objects owned by other users can be
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1568,6 +1568,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Primitive capabilities used outside of map_meta_cap():
</span><span class="cx" style="display: block; padding: 0 10px"> 'edit_posts' => 'edit_' . $plural_base,
</span><span class="cx" style="display: block; padding: 0 10px"> 'edit_others_posts' => 'edit_others_' . $plural_base,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'delete_posts' => 'delete_' . $plural_base,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'publish_posts' => 'publish_' . $plural_base,
</span><span class="cx" style="display: block; padding: 0 10px"> 'read_private_posts' => 'read_private_' . $plural_base,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1576,7 +1577,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $args->map_meta_cap ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $default_capabilities_for_mapping = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'read' => 'read',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'delete_posts' => 'delete_' . $plural_base,
</del><span class="cx" style="display: block; padding: 0 10px"> 'delete_private_posts' => 'delete_private_' . $plural_base,
</span><span class="cx" style="display: block; padding: 0 10px"> 'delete_published_posts' => 'delete_published_' . $plural_base,
</span><span class="cx" style="display: block; padding: 0 10px"> 'delete_others_posts' => 'delete_others_' . $plural_base,
</span></span></pre></div>
<a id="trunktestsphpunittestsusermapMetaCapphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/user/mapMetaCap.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/mapMetaCap.php 2020-02-25 11:12:18 UTC (rev 47356)
+++ trunk/tests/phpunit/tests/user/mapMetaCap.php 2020-02-25 12:48:11 UTC (rev 47357)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -304,6 +304,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @ticket 30991
+ */
+ function test_delete_posts_cap_without_map_meta_cap() {
+ register_post_type(
+ self::$post_type,
+ array(
+ 'capability_type' => 'post',
+ 'map_meta_cap' => false,
+ )
+ );
+
+ $post_type_object = get_post_type_object( self::$post_type );
+
+ $this->assertFalse( $post_type_object->map_meta_cap );
+ $this->assertEquals( 'delete_posts', $post_type_object->cap->delete_posts );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> function test_unfiltered_html_cap() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( defined( 'DISALLOW_UNFILTERED_HTML' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( DISALLOW_UNFILTERED_HTML );
</span></span></pre>
</div>
</div>
</body>
</html>