golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use the post type object in get_posts_by_author_sql() and add a post type parameter to count_many_users_posts(). The formerly somewhat useless and now totally useless pub_priv_sql_capability filter is considered deprecated. fixes #17220. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@17742 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2011-04-28 11:27:39 +00:00
parent 65a9b98246
commit 24ea36e302
2 changed files with 27 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
wp-includes/post.php
View File

@ -4047,63 +4047,49 @@ function wp_check_for_changed_slugs($post_id, $post, $post_before) {
* Retrieve the private post SQL based on capability. * Retrieve the private post SQL based on capability.
* *
* This function provides a standardized way to appropriately select on the * This function provides a standardized way to appropriately select on the
* post_status of posts/pages. The function will return a piece of SQL code that * post_status of a post type. The function will return a piece of SQL code
* can be added to a WHERE clause; this SQL is constructed to allow all * that can be added to a WHERE clause; this SQL is constructed to allow all
* published posts, and all private posts to which the user has access. * published posts, and all private posts to which the user has access.
* *
* It also allows plugins that define their own post type to control the cap by
* using the hook 'pub_priv_sql_capability'. The plugin is expected to return
* the capability the user must have to read the private post type.
*
* @since 2.2.0 * @since 2.2.0
* *
* @uses $user_ID * @uses $user_ID
* @uses apply_filters() Call 'pub_priv_sql_capability' filter for plugins with different post types.
* *
* @param string $post_type currently only supports 'post' or 'page'. * @param string $post_type currently only supports 'post' or 'page'.
* @return string SQL code that can be added to a where clause. * @return string SQL code that can be added to a where clause.
*/ */
function get_private_posts_cap_sql($post_type) { function get_private_posts_cap_sql( $post_type ) {
return get_posts_by_author_sql($post_type, FALSE); return get_posts_by_author_sql( $post_type, false );
} }
/** /**
* Retrieve the post SQL based on capability, author, and type. * Retrieve the post SQL based on capability, author, and type.
* *
* See above for full description. * @see get_private_posts_cap_sql() for full description.
* *
* @since 3.0.0 * @since 3.0.0
* @param string $post_type currently only supports 'post' or 'page'. * @param string $post_type Post type.
* @param bool $full Optional. Returns a full WHERE statement instead of just an 'andalso' term. * @param bool $full Optional. Returns a full WHERE statement instead of just an 'andalso' term.
* @param int $post_author Optional. Query posts having a single author ID. * @param int $post_author Optional. Query posts having a single author ID.
* @return string SQL WHERE code that can be added to a query. * @return string SQL WHERE code that can be added to a query.
*/ */
function get_posts_by_author_sql($post_type, $full = TRUE, $post_author = NULL) { function get_posts_by_author_sql( $post_type, $full = true, $post_author = null ) {
global $user_ID, $wpdb; global $user_ID, $wpdb;
// Private posts // Private posts
if ($post_type == 'post') { $post_type_obj = get_post_type_object( $post_type );
$cap = 'read_private_posts'; if ( ! $post_type_obj )
// Private pages return ' 1 = 0 ';
} elseif ($post_type == 'page') {
$cap = 'read_private_pages';
// Dunno what it is, maybe plugins have their own post type?
} else {
$cap = '';
$cap = apply_filters('pub_priv_sql_capability', $cap);
if (empty($cap)) { // This hook is deprecated. Why you'd want to use it, I dunno.
// We don't know what it is, filters don't change anything, if ( ! $cap = apply_filters( 'pub_priv_sql_capability', '' ) )
// so set the SQL up to return nothing. $cap = $post_type_obj->cap->read_private_posts;
return ' 1 = 0 ';
}
}
if ($full) { if ( $full ) {
if (is_null($post_author)) { if ( null === $post_author ) {
$sql = $wpdb->prepare('WHERE post_type = %s AND ', $post_type); $sql = $wpdb->prepare( 'WHERE post_type = %s AND ', $post_type );
} else { } else {
$sql = $wpdb->prepare('WHERE post_author = %d AND post_type = %s AND ', $post_author, $post_type); $sql = $wpdb->prepare( 'WHERE post_author = %d AND post_type = %s AND ', $post_author, $post_type );
} }
} else { } else {
$sql = ''; $sql = '';
@ -4111,15 +4097,15 @@ function get_posts_by_author_sql($post_type, $full = TRUE, $post_author = NULL)
$sql .= "(post_status = 'publish'"; $sql .= "(post_status = 'publish'";
if (current_user_can($cap)) { if ( current_user_can( $cap ) ) {
// Does the user have the capability to view private posts? Guess so. // Does the user have the capability to view private posts? Guess so.
$sql .= " OR post_status = 'private'"; $sql .= " OR post_status = 'private'";
} elseif (is_user_logged_in()) { } elseif ( is_user_logged_in() ) {
// Users can view their own private posts. // Users can view their own private posts.
$id = (int) $user_ID; $id = (int) $user_ID;
if (is_null($post_author) || !$full) { if ( null === $post_author || ! $full ) {
$sql .= " OR post_status = 'private' AND post_author = $id"; $sql .= " OR post_status = 'private' AND post_author = $id";
} elseif ($id == (int)$post_author) { } elseif ( $id == (int) $post_author ) {
$sql .= " OR post_status = 'private'"; $sql .= " OR post_status = 'private'";
} // else none } // else none
} // else none } // else none

11
wp-includes/user.php
View File

@ -165,18 +165,19 @@ function count_user_posts($userid) {
* Number of posts written by a list of users. * Number of posts written by a list of users.
* *
* @since 3.0.0 * @since 3.0.0
* @param array $users User ID number list. * @param array $user_ids Array of user IDs.
* @param string|array $post_type Optional. Post type to check. Defaults to post.
* @return array Amount of posts each user has written. * @return array Amount of posts each user has written.
*/ */
function count_many_users_posts($users) { function count_many_users_posts($users, $post_type = 'post' ) {
global $wpdb; global $wpdb;
$count = array(); $count = array();
if ( ! is_array($users) || empty( $users ) ) if ( empty( $users ) || ! is_array( $users ) )
return $count; return $count;
$userlist = implode( ',', $users ); $userlist = implode( ',', array_map( 'absint', $users ) );
$where = get_posts_by_author_sql( 'post' ); $where = get_posts_by_author_sql( $post_type );
$result = $wpdb->get_results( "SELECT post_author, COUNT(*) FROM $wpdb->posts $where AND post_author IN ($userlist) GROUP BY post_author", ARRAY_N ); $result = $wpdb->get_results( "SELECT post_author, COUNT(*) FROM $wpdb->posts $where AND post_author IN ($userlist) GROUP BY post_author", ARRAY_N );
foreach ( $result as $row ) { foreach ( $result as $row ) {