Changeset 27466 for trunk/src/wp-admin/includes/user.php

Timestamp:

03/08/2014 03:15:06 AM (12 years ago)

Author:

nacin

Message:

Normalize $reassign in wp_delete_user() to ensure the hooks receive consistent values.

fixes #23057.

File:

• trunk/src/wp-admin/includes/user.php (modified) (5 diffs)

trunk/src/wp-admin/includes/user.php

@@ -269 +269 @@
  * @return bool True when finished.
  */
-function wp_delete_user( $id, $reassign = 'novalue' ) {
+function wp_delete_user( $id, $reassign = null ) {
         global $wpdb;
 
@@ -278 +278 @@
                 return false;
 
+        // Normalize $reassign to null or a user ID. 'novalue' was an older default.
+        if ( 'novalue' === $reassign ) {
+                $reassign = null;
+        } elseif ( null !== $reassign ) {
+                $reassign = (int) $reassign;
+        }
+
+        var_dump( $reassign );
+        die;
+
         /**
          * Fires immediately before a user is deleted from the database.
@@ -283 +293 @@
          * @since 2.0.0
          *
-         * @param int        $id       ID of the user to delete.
-         * @param int|string $reassign ID of the user to reassign posts and links to. Default 'novalue'.
+         * @param int      $id       ID of the user to delete.
+         * @param int|null $reassign ID of the user to reassign posts and links to.
+         *                           Default null, for no reassignment.
          */
         do_action( 'delete_user', $id, $reassign );
 
-        if ( 'novalue' === $reassign || null === $reassign ) {
+        if ( null === $reassign ) {
                 $post_types_to_delete = array();
                 foreach ( get_post_types( array(), 'objects' ) as $post_type ) {
@@ -322 +333 @@
                 }
         } else {
-                $reassign = (int) $reassign;
                 $post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_author = %d", $id ) );
                 $wpdb->update( $wpdb->posts, array('post_author' => $reassign), array('post_author' => $id) );
@@ -355 +365 @@
          * @since 2.9.0
          *
-         * @param int        $id       ID of the deleted user.
-         * @param int|string $reassign ID of the user to reassign posts and links to. Default 'novalue'.
+         * @param int      $id       ID of the deleted user.
+         * @param int|null $reassign ID of the user to reassign posts and links to.
+         *                           Default null, for no reassignment.
          */
         do_action( 'deleted_user', $id, $reassign );