<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[15892] trunk/wp-includes/post.php: Clean up get_post_type_capabilities.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15892">15892</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-10-21 15:05:10 +0000 (Thu, 21 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up get_post_type_capabilities. Don't bother with new capabilities for edit_others_posts and delete_others_posts if the post type does not support authors.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (15891 => 15892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2010-10-21 14:55:15 UTC (rev 15891)
+++ trunk/wp-includes/post.php 2010-10-21 15:05:10 UTC (rev 15892)
</span><span class="lines">@@ -989,8 +989,6 @@
</span><span class="cx"> * @return object object with all the capabilities as member variables
</span><span class="cx"> */
</span><span class="cx"> function get_post_type_capabilities( $args ) {
</span><del>- global $_post_type_meta_capabilities;
-
</del><span class="cx"> $default_capabilities = array(
</span><span class="cx"> // Meta capabilities are generally mapped to primitive capabilities depending on the context
</span><span class="cx"> // (which would be the post being edited/deleted/read), instead of granted to users or roles:
</span><span class="lines">@@ -1003,22 +1001,33 @@
</span><span class="cx"> 'publish_posts' => 'publish_' . $args->capability_type . 's',
</span><span class="cx"> 'read_private_posts' => 'read_private_' . $args->capability_type . 's',
</span><span class="cx"> );
</span><ins>+
</ins><span class="cx"> // Primitive capabilities that are used within map_meta_cap():
</span><span class="cx"> if ( $args->map_meta_cap ) {
</span><span class="cx"> $default_capabilities_for_mapping = array(
</span><span class="cx"> 'read' => 'read',
</span><span class="cx"> 'delete_posts' => 'delete_' . $args->capability_type . 's',
</span><span class="cx"> 'delete_private_posts' => 'delete_private_' . $args->capability_type . 's',
</span><del>- 'delete_published_posts' => 'delete_published_' . $args->capability_type . 's',
</del><ins>+ 'delete_published_posts' => 'delete_published_' . $args->capability_type . 's',
</ins><span class="cx"> 'delete_others_posts' => 'delete_others_' . $args->capability_type . 's',
</span><span class="cx"> 'edit_private_posts' => 'edit_private_' . $args->capability_type . 's',
</span><span class="cx"> 'edit_published_posts' => 'edit_published_' . $args->capability_type . 's',
</span><span class="cx"> );
</span><span class="cx"> $default_capabilities = array_merge( $default_capabilities, $default_capabilities_for_mapping );
</span><span class="cx"> }
</span><ins>+
+ if ( ! post_type_supports( $args->name, 'author' ) ) {
+ // While these may be checked in core, users/roles shouldn't need to be granted these.
+ $default_capabilities['edit_others_posts'] = $default_capabilities['edit_posts'];
+ $default_capabilities['delete_others_posts'] = $default_capabilities['delete_posts'];
+ }
+
</ins><span class="cx"> $capabilities = array_merge( $default_capabilities, $args->capabilities );
</span><ins>+
+ // Remember meta capabilities for future reference.
</ins><span class="cx"> if ( $args->map_meta_cap )
</span><span class="cx"> _post_type_meta_capabilities( $capabilities );
</span><ins>+
</ins><span class="cx"> return (object) $capabilities;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>