<!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>[22908] trunk: Use the create_posts post type cap 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/22908">22908</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-11-28 22:28:20 +0000 (Wed, 28 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use the create_posts post type cap in more places. Remove the janky create_posts meta cap. see <a href="http://core.trac.wordpress.org/ticket/16714">#16714</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminindexphp">trunk/wp-admin/index.php</a></li>
<li><a href="#trunkwpadminmenuphp">trunk/wp-admin/menu.php</a></li>
<li><a href="#trunkwpadminpressthisphp">trunk/wp-admin/press-this.php</a></li>
<li><a href="#trunkwpincludesadminbarphp">trunk/wp-includes/admin-bar.php</a></li>
<li><a href="#trunkwpincludescapabilitiesphp">trunk/wp-includes/capabilities.php</a></li>
<li><a href="#trunkwpincludesclasswpxmlrpcserverphp">trunk/wp-includes/class-wp-xmlrpc-server.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminindexphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/index.php (22907 => 22908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/index.php 2012-11-28 22:27:13 UTC (rev 22907)
+++ trunk/wp-admin/index.php 2012-11-28 22:28:20 UTC (rev 22908)
</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( 'create_posts' ) ) {
</del><ins>+if ( current_user_can( get_post_type_object( 'post' )->cap->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="trunkwpadminmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/menu.php (22907 => 22908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/menu.php 2012-11-28 22:27:13 UTC (rev 22907)
+++ trunk/wp-admin/menu.php 2012-11-28 22:28:20 UTC (rev 22908)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> $menu[5] = array( __('Posts'), 'edit_posts', 'edit.php', '', 'open-if-no-js menu-top menu-icon-post', 'menu-posts', 'none' );
</span><span class="cx"> $submenu['edit.php'][5] = array( __('All Posts'), 'edit_posts', 'edit.php' );
</span><span class="cx"> /* translators: add new post */
</span><del>- $submenu['edit.php'][10] = array( _x('Add New', 'post'), 'create_posts', 'post-new.php' );
</del><ins>+ $submenu['edit.php'][10] = array( _x('Add New', 'post'), get_post_type_object( 'post' )->cap->create_posts, 'post-new.php' );
</ins><span class="cx">
</span><span class="cx"> $i = 15;
</span><span class="cx"> foreach ( get_taxonomies( array(), 'objects' ) as $tax ) {
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> $menu[20] = array( __('Pages'), 'edit_pages', 'edit.php?post_type=page', '', 'menu-top menu-icon-page', 'menu-pages', 'none' );
</span><span class="cx"> $submenu['edit.php?post_type=page'][5] = array( __('All Pages'), 'edit_pages', 'edit.php?post_type=page' );
</span><span class="cx"> /* translators: add new page */
</span><del>- $submenu['edit.php?post_type=page'][10] = array( _x('Add New', 'page'), 'edit_pages', 'post-new.php?post_type=page' );
</del><ins>+ $submenu['edit.php?post_type=page'][10] = array( _x('Add New', 'page'), get_post_type_object( 'page' )->cap->create_posts, 'post-new.php?post_type=page' );
</ins><span class="cx"> $i = 15;
</span><span class="cx"> foreach ( get_taxonomies( array(), 'objects' ) as $tax ) {
</span><span class="cx"> if ( ! $tax->show_ui || ! in_array('page', (array) $tax->object_type, true) )
</span></span></pre></div>
<a id="trunkwpadminpressthisphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/press-this.php (22907 => 22908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/press-this.php 2012-11-28 22:27:13 UTC (rev 22907)
+++ trunk/wp-admin/press-this.php 2012-11-28 22:28:20 UTC (rev 22908)
</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' ) || ! current_user_can( 'create_posts' ) )
</del><ins>+if ( ! current_user_can( 'edit_posts' ) || ! current_user_can( get_post_type_object( 'post' )->cap->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="trunkwpincludesadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/admin-bar.php (22907 => 22908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/admin-bar.php 2012-11-28 22:27:13 UTC (rev 22907)
+++ trunk/wp-includes/admin-bar.php 2012-11-28 22:28:20 UTC (rev 22908)
</span><span class="lines">@@ -363,13 +363,16 @@
</span><span class="cx"> 'href' => admin_url(),
</span><span class="cx"> ) );
</span><span class="cx">
</span><del>- if ( current_user_can( 'edit_posts' ) ) {
</del><ins>+ if ( current_user_can( get_post_type_object( 'post' )->cap->create_posts ) ) {
</ins><span class="cx"> $wp_admin_bar->add_menu( array(
</span><span class="cx"> 'parent' => $menu_id,
</span><span class="cx"> 'id' => $menu_id . '-n',
</span><span class="cx"> 'title' => __( 'New Post' ),
</span><span class="cx"> 'href' => admin_url( 'post-new.php' ),
</span><span class="cx"> ) );
</span><ins>+ }
+
+ if ( current_user_can( 'edit_posts' ) ) {
</ins><span class="cx"> $wp_admin_bar->add_menu( array(
</span><span class="cx"> 'parent' => $menu_id,
</span><span class="cx"> 'id' => $menu_id . '-c',
</span></span></pre></div>
<a id="trunkwpincludescapabilitiesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/capabilities.php (22907 => 22908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/capabilities.php 2012-11-28 22:27:13 UTC (rev 22907)
+++ trunk/wp-includes/capabilities.php 2012-11-28 22:28:20 UTC (rev 22908)
</span><span class="lines">@@ -1060,14 +1060,6 @@
</span><span class="cx"> $caps[] = $post_type->cap->delete_private_posts;
</span><span class="cx"> }
</span><span class="cx"> break;
</span><del>- // current_user_can( 'create_posts', $post_type )
- case 'create_posts':
- $post_type = isset( $args[0] ) ? $args[0] : 'post';
- $post_type_object = get_post_type_object( $post_type );
-
- $caps[] = $post_type_object->cap->create_posts;
-
- break;
</del><span class="cx"> // edit_post breaks down to edit_posts, edit_published_posts, or
</span><span class="cx"> // edit_others_posts
</span><span class="cx"> case 'edit_post':
</span></span></pre></div>
<a id="trunkwpincludesclasswpxmlrpcserverphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-xmlrpc-server.php (22907 => 22908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-xmlrpc-server.php 2012-11-28 22:27:13 UTC (rev 22907)
+++ trunk/wp-includes/class-wp-xmlrpc-server.php 2012-11-28 22:28:20 UTC (rev 22908)
</span><span class="lines">@@ -1016,7 +1016,7 @@
</span><span class="cx"> if ( $post_data['post_type'] != get_post_type( $post_data['ID'] ) )
</span><span class="cx"> return new IXR_Error( 401, __( 'The post type may not be changed.' ) );
</span><span class="cx"> } else {
</span><del>- if ( ! current_user_can( $post_type->cap->edit_posts ) )
</del><ins>+ if ( ! current_user_can( $post_type->cap->create_posts ) || ! current_user_can( $post_type->cap->edit_posts ) )
</ins><span class="cx"> return new IXR_Error( 401, __( 'Sorry, you are not allowed to post on this site.' ) );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3928,7 +3928,7 @@
</span><span class="cx"> do_action('xmlrpc_call', 'blogger.newPost');
</span><span class="cx">
</span><span class="cx"> $cap = ($publish) ? 'publish_posts' : 'edit_posts';
</span><del>- if ( !current_user_can($cap) )
</del><ins>+ if ( ! current_user_can( get_post_type_object( 'post' )->cap->create_posts ) || !current_user_can($cap) )
</ins><span class="cx"> return new IXR_Error(401, __('Sorry, you are not allowed to post on this site.'));
</span><span class="cx">
</span><span class="cx"> $post_status = ($publish) ? 'publish' : 'draft';
</span><span class="lines">@@ -4143,6 +4143,8 @@
</span><span class="cx"> $post_type = 'post';
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ( ! current_user_can( get_post_type_object( $post_type )->cap->create_posts ) )
+ return new IXR_Error( 401, __( 'Sorry, you are not allowed to publish posts on this site.' ) );
</ins><span class="cx"> if ( !current_user_can( $cap ) )
</span><span class="cx"> return new IXR_Error( 401, $error_message );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>