WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Users: Introduce `users_have_additional_content` filter to indicate whether the users being deleted have additional content associated with them outside of the `post_author` and `link_owner` relationships. 

Props garrett-eclipse, xkon, birgire.
Fixes #36860.
Built from https://develop.svn.wordpress.org/trunk@44967


git-svn-id: http://core.svn.wordpress.org/trunk@44798 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2019-03-21 20:12:50 +00:00
parent 7d74080b80
commit 1fc763e85e
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wp-admin/users.php
View File

@ -234,12 +234,24 @@ switch ( $wp_list_table->current_action() ) {
$userids = array_map( 'intval', (array) $_REQUEST['users'] ); $userids = array_map( 'intval', (array) $_REQUEST['users'] );
} }
$users_have_content = false; /**
* Filters whether the users being deleted have additional content
* associated with them outside of the `post_author` and `link_owner` relationships.
*
* @since 5.2.0
*
* @param boolean $users_have_additional_content Whether the users have additional content. Default false.
* @param int[] $userids Array of IDs for users being deleted.
*/
$users_have_content = (bool) apply_filters( 'users_have_additional_content', false, $userids );
if ( ! $users_have_content ) {
if ( $wpdb->get_var( "SELECT ID FROM {$wpdb->posts} WHERE post_author IN( " . implode( ',', $userids ) . ' ) LIMIT 1' ) ) { if ( $wpdb->get_var( "SELECT ID FROM {$wpdb->posts} WHERE post_author IN( " . implode( ',', $userids ) . ' ) LIMIT 1' ) ) {
$users_have_content = true; $users_have_content = true;
} elseif ( $wpdb->get_var( "SELECT link_id FROM {$wpdb->links} WHERE link_owner IN( " . implode( ',', $userids ) . ' ) LIMIT 1' ) ) { } elseif ( $wpdb->get_var( "SELECT link_id FROM {$wpdb->links} WHERE link_owner IN( " . implode( ',', $userids ) . ' ) LIMIT 1' ) ) {
$users_have_content = true; $users_have_content = true;
} }
}
if ( $users_have_content ) { if ( $users_have_content ) {
add_action( 'admin_head', 'delete_users_add_js' ); add_action( 'admin_head', 'delete_users_add_js' );

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.2-alpha-44966'; $wp_version = '5.2-alpha-44967';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.