Changeset 6679 for trunk/src/includes/admin/classes/class-bbp-converter-base.php

Timestamp:

09/07/2017 04:37:29 AM (9 years ago)

Author:

johnjamesjacoby

Message:

Converter: Improve clean logic when checking for deleted activity.

This change fixes a condition where meta-data is out-of-sync with posts or users, resulting in a false assignment of true when there actually is no data to delete, and no data has been deleted. Now when this happens, the converter will proceed as intended.

Trunk, for 2.6.

File:

• trunk/src/includes/admin/classes/class-bbp-converter-base.php (modified) (2 diffs)

trunk/src/includes/admin/classes/class-bbp-converter-base.php

@@ -846 +846 @@
         if ( isset( $posts[0] ) && ! empty( $posts[0]['value_id'] ) ) {
             foreach ( (array) $posts as $value ) {
-                wp_delete_post( $value['value_id'], true );
+                $deleted = wp_delete_post( $value['value_id'], true );
+
+                // Only flag if not empty or error
+                if ( ( false === $has_delete ) && ! empty( $deleted ) && ! is_wp_error( $deleted ) ) {
+                    $has_delete = true;
+                }
             }
-            $has_delete = true;
         }
 
@@ -861 +865 @@
         if ( ! empty( $users ) ) {
             foreach ( $users as $value ) {
-                wp_delete_user( $value['value_id'] );
+                $deleted = wp_delete_user( $value['value_id'] );
+
+                // Only flag if not empty or error
+                if ( ( false === $has_delete ) && ! empty( $deleted ) && ! is_wp_error( $deleted ) ) {
+                    $has_delete = true;
+                }
             }
-            $has_delete = true;
         }