<!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>[22291] trunk: Use the create_posts capability in more places.</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/22291">22291</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-10-24 22:15:43 +0000 (Wed, 24 Oct 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use the create_posts capability in more places.
In get_post_type_capabilities(), make sure create_posts reflects customizations to the edit_posts capability when create_posts is not specifically set.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmineditformadvancedphp">trunk/wp-admin/edit-form-advanced.php</a></li>
<li><a href="#trunkwpadmineditphp">trunk/wp-admin/edit.php</a></li>
<li><a href="#trunkwpadminindexphp">trunk/wp-admin/index.php</a></li>
<li><a href="#trunkwpadminpostnewphp">trunk/wp-admin/post-new.php</a></li>
<li><a href="#trunkwpadminpressthisphp">trunk/wp-admin/press-this.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmineditformadvancedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-form-advanced.php (22290 => 22291)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-form-advanced.php 2012-10-24 14:08:33 UTC (rev 22290)
+++ trunk/wp-admin/edit-form-advanced.php 2012-10-24 22:15:43 UTC (rev 22291)
</span><span class="lines">@@ -274,7 +274,11 @@
</span><span class="cx">
</span><span class="cx"> <div class="wrap">
</span><span class="cx"> <?php screen_icon(); ?>
</span><del>-<h2><?php echo esc_html( $title ); ?><?php if ( isset( $post_new_file ) ) : ?> <a href="<?php echo esc_url( $post_new_file ) ?>" class="add-new-h2"><?php echo esc_html($post_type_object->labels->add_new); ?></a><?php endif; ?></h2>
</del><ins>+<h2><?php
+echo esc_html( $title );
+if ( isset( $post_new_file ) && current_user_can( $post_type_object->cap->create_posts ) )
+ echo ' <a href="' . esc_url( $post_new_file ) . '" class="add-new-h2">' . esc_html( $post_type_object->labels->add_new ) . '</a>';
+?></h2>
</ins><span class="cx"> <?php if ( $notice ) : ?>
</span><span class="cx"> <div id="notice" class="error"><p><?php echo $notice ?></p></div>
</span><span class="cx"> <?php endif; ?>
</span></span></pre></div>
<a id="trunkwpadmineditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit.php (22290 => 22291)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit.php 2012-10-24 14:08:33 UTC (rev 22290)
+++ trunk/wp-admin/edit.php 2012-10-24 22:15:43 UTC (rev 22291)
</span><span class="lines">@@ -221,10 +221,13 @@
</span><span class="cx"> ?>
</span><span class="cx"> <div class="wrap">
</span><span class="cx"> <?php screen_icon(); ?>
</span><del>-<h2><?php echo esc_html( $post_type_object->labels->name ); ?> <a href="<?php echo $post_new_file ?>" class="add-new-h2"><?php echo esc_html($post_type_object->labels->add_new); ?></a> <?php
</del><ins>+<h2><?php
+echo esc_html( $post_type_object->labels->name );
+if ( current_user_can( $post_type_object->cap->create_posts ) )
+ echo ' <a href="' . esc_url( $post_new_file ) . '" class="add-new-h2">' . esc_html( $post_type_object->labels->add_new ) . '</a>';
</ins><span class="cx"> if ( ! empty( $_REQUEST['s'] ) )
</span><del>- printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', get_search_query() ); ?>
-</h2>
</del><ins>+ printf( ' <span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', get_search_query() );
+?></h2>
</ins><span class="cx">
</span><span class="cx"> <?php if ( isset( $_REQUEST['locked'] ) || isset( $_REQUEST['updated'] ) || isset( $_REQUEST['deleted'] ) || isset( $_REQUEST['trashed'] ) || isset( $_REQUEST['untrashed'] ) ) {
</span><span class="cx"> $messages = array();
</span></span></pre></div>
<a id="trunkwpadminindexphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/index.php (22290 => 22291)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/index.php 2012-10-24 14:08:33 UTC (rev 22290)
+++ trunk/wp-admin/index.php 2012-10-24 22:15:43 UTC (rev 22291)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> $help .= '<p>' . __('<strong>Recent Comments</strong> - Shows the most recent comments on your posts (configurable, up to 30) and allows you to moderate them.') . '</p>';
</span><span class="cx"> if ( current_user_can( 'publish_posts' ) )
</span><span class="cx"> $help .= '<p>' . __('<strong>Incoming Links</strong> - Shows links to your site found by Google Blog Search.') . '</p>';
</span><del>-if ( current_user_can( 'edit_posts' ) ) {
</del><ins>+if ( current_user_can( 'create_posts' ) ) {
</ins><span class="cx"> $help .= '<p>' . __('<strong>QuickPress</strong> - Allows you to create a new post and either publish it or save it as a draft.') . '</p>';
</span><span class="cx"> $help .= '<p>' . __('<strong>Recent Drafts</strong> - Displays links to the 5 most recent draft posts you&#8217;ve started.') . '</p>';
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminpostnewphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/post-new.php (22290 => 22291)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/post-new.php 2012-10-24 14:08:33 UTC (rev 22290)
+++ trunk/wp-admin/post-new.php 2012-10-24 22:15:43 UTC (rev 22291)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">
</span><span class="cx"> $editing = true;
</span><span class="cx">
</span><del>-if ( ! current_user_can( $post_type_object->cap->edit_posts ) )
</del><ins>+if ( ! current_user_can( $post_type_object->cap->edit_posts ) || ! current_user_can( $post_type_object->cap->create_posts ) )
</ins><span class="cx"> wp_die( __( 'Cheatin&#8217; uh?' ) );
</span><span class="cx">
</span><span class="cx"> // Schedule auto-draft cleanup
</span></span></pre></div>
<a id="trunkwpadminpressthisphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/press-this.php (22290 => 22291)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/press-this.php 2012-10-24 14:08:33 UTC (rev 22290)
+++ trunk/wp-admin/press-this.php 2012-10-24 22:15:43 UTC (rev 22291)
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx">
</span><span class="cx"> header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
</span><span class="cx">
</span><del>-if ( ! current_user_can('edit_posts') )
</del><ins>+if ( ! current_user_can( 'edit_posts' ) || ! current_user_can( 'create_posts' ) )
</ins><span class="cx"> wp_die( __( 'Cheatin&#8217; uh?' ) );
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (22290 => 22291)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2012-10-24 14:08:33 UTC (rev 22290)
+++ trunk/wp-includes/post.php 2012-10-24 22:15:43 UTC (rev 22291)
</span><span class="lines">@@ -1411,8 +1411,6 @@
</span><span class="cx"> 'edit_others_posts' => 'edit_others_' . $plural_base,
</span><span class="cx"> 'publish_posts' => 'publish_' . $plural_base,
</span><span class="cx"> 'read_private_posts' => 'read_private_' . $plural_base,
</span><del>- // Post creation capability simply maps to edit_posts by default:
- 'create_posts' => 'edit_' . $plural_base,
</del><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> // Primitive capabilities used within map_meta_cap():
</span><span class="lines">@@ -1431,6 +1429,10 @@
</span><span class="cx">
</span><span class="cx"> $capabilities = array_merge( $default_capabilities, $args->capabilities );
</span><span class="cx">
</span><ins>+ // Post creation capability simply maps to edit_posts by default:
+ if ( ! isset( $capabilities['create_posts'] ) )
+ $capabilities['create_posts'] = $capabilities['edit_posts'];
+
</ins><span class="cx"> // Remember meta capabilities for future reference.
</span><span class="cx"> if ( $args->map_meta_cap )
</span><span class="cx"> _post_type_meta_capabilities( $capabilities );
</span></span></pre>
</div>
</div>
</body>
</html>