<!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>[16273] trunk/wp-includes: Cripple capability_type.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16273">16273</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-11-10 14:50:14 +0000 (Wed, 10 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cripple capability_type. Produced inconsistent, janky meta cap mapping; now only acts as a capability base. see <a href="http://trac.wordpress.org/ticket/14122">#14122</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludescapabilitiesphp">trunk/wp-includes/capabilities.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludescapabilitiesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/capabilities.php (16272 => 16273)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/capabilities.php 2010-11-10 14:27:15 UTC (rev 16272)
+++ trunk/wp-includes/capabilities.php 2010-11-10 14:50:14 UTC (rev 16273)
</span><span class="lines">@@ -826,9 +826,9 @@
</span><span class="cx"> $post = get_post( $args[0] );
</span><span class="cx"> $post_type = get_post_type_object( $post->post_type );
</span><span class="cx">
</span><del>- if ( 'delete_post' == $cap && $post_type && 'post' != $post_type->capability_type && ! $post_type->map_meta_cap ) {
- $args = array_merge( array( $post_type->cap->delete_post, $user_id ), $args );
- return call_user_func_array( 'map_meta_cap', $args );
</del><ins>+ if ( ! $post_type->map_meta_cap ) {
+ $caps[] = $post_type->cap->$cap;
+ break;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( '' != $post->post_author && post_type_supports( $post_type->name, 'author' ) ) {
</span><span class="lines">@@ -869,9 +869,9 @@
</span><span class="cx"> $post = get_post( $args[0] );
</span><span class="cx"> $post_type = get_post_type_object( $post->post_type );
</span><span class="cx">
</span><del>- if ( 'edit_post' == $cap && $post_type && 'post' != $post_type->capability_type && ! $post_type->map_meta_cap ) {
- $args = array_merge( array( $post_type->cap->edit_post, $user_id ), $args );
- return call_user_func_array( 'map_meta_cap', $args );
</del><ins>+ if ( ! $post_type->map_meta_cap ) {
+ $caps[] = $post_type->cap->$cap;
+ break;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( '' != $post->post_author && post_type_supports( $post_type->name, 'author' ) ) {
</span><span class="lines">@@ -911,9 +911,9 @@
</span><span class="cx"> $post = get_post( $args[0] );
</span><span class="cx"> $post_type = get_post_type_object( $post->post_type );
</span><span class="cx">
</span><del>- if ( 'read_post' == $cap && $post_type && 'post' != $post_type->capability_type && ! $post_type->map_meta_cap ) {
- $args = array_merge( array( $post_type->cap->read_post, $user_id ), $args );
- return call_user_func_array( 'map_meta_cap', $args );
</del><ins>+ if ( ! $post_type->map_meta_cap ) {
+ $caps[] = $post_type->cap->$cap;
+ break;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( 'private' != $post->post_status ) {
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (16272 => 16273)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2010-11-10 14:27:15 UTC (rev 16272)
+++ trunk/wp-includes/post.php 2010-11-10 14:50:14 UTC (rev 16273)
</span><span class="lines">@@ -842,7 +842,7 @@
</span><span class="cx"> * show_ui must be true.
</span><span class="cx"> * - menu_position - The position in the menu order the post type should appear. Defaults to the bottom.
</span><span class="cx"> * - menu_icon - The url to the icon to be used for this menu. Defaults to use the posts icon.
</span><del>- * - capability_type - The post type to use for checking read, edit, and delete capabilities. Defaults to 'post'.
</del><ins>+ * - capability_type - The string to use to build the read, edit, and delete capabilities. Defaults to 'post'.
</ins><span class="cx"> * May be passed as an array to allow for alternative plurals when using this argument as a base to construct the
</span><span class="cx"> * capabilities, e.g. array('story', 'stories').
</span><span class="cx"> * - capabilities - Array of capabilities for this post type. By default the capability_type is used
</span><span class="lines">@@ -917,9 +917,6 @@
</span><span class="cx"> if ( null === $args->exclude_from_search )
</span><span class="cx"> $args->exclude_from_search = !$args->public;
</span><span class="cx">
</span><del>- if ( empty($args->capability_type) )
- $args->capability_type = 'post';
-
</del><span class="cx"> $args->cap = get_post_type_capabilities( $args );
</span><span class="cx"> unset($args->capabilities);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>