Changeset 6189

Timestamp:

12/27/2016 11:57:33 PM (4 years ago)

Author:

johnjamesjacoby

Message:

Tools: Use get_results(), and don't delete usermeta.

(Maybe we should have a separate clean-up tool once it's confirmed to be OK.)

See #2959.

File:

• trunk/src/includes/admin/tools.php (modified) (8 diffs)

trunk/src/includes/admin/tools.php

@@ -2229 +2229 @@
     $changed   = $total = 0;
     $key       = $bbp_db->prefix . '_bbp_favorites';
-    $favorites = $bbp_db->get_col( "SELECT * FROM {$bbp_db->usermeta} WHERE meta_key = '{$key}'" );
+    $favorites = $bbp_db->get_results( "SELECT * FROM {$bbp_db->usermeta} WHERE meta_key = '{$key}'" );
 
     // Bail if no closed topics found
@@ -2237 +2237 @@
 
     // Loop through each user's favorites
-    foreach ( $favorites as $meta_id => $meta ) {
+    foreach ( $favorites as $meta ) {
 
         // Get post IDs
@@ -2248 +2248 @@
 
             // Skip if already exists
-            if ( $bbp_db->get_var( $bbp_db->prepare( "SELECT COUNT(*) FROM {$bbp_db->postmeta} WHERE post_id = %d AND meta_key = %s AND meta_value = %d" ), $post_id, '_bbp_favorite', $meta->user_id ) ) {
+            if ( $bbp_db->get_var( $bbp_db->prepare( "SELECT COUNT(*) FROM {$bbp_db->postmeta} WHERE post_id = %d AND meta_key = %s AND meta_value = %d", $post_id, '_bbp_favorite', $meta->user_id ) ) ) {
                 continue;
             }
@@ -2264 +2264 @@
         // Delete user meta if everything was copied successfully
         if ( $changed === $to_change ) {
-            delete_metadata_by_mid( 'user', $meta_id );
+            //delete_metadata_by_mid( 'user', $meta->umeta_id );
         }
     }
@@ -2292 +2292 @@
     $changed       = $total = 0;
     $key           = $bbp_db->prefix . '_bbp_subscriptions';
-    $subscriptions = $bbp_db->get_col( "SELECT * FROM {$bbp_db->usermeta} WHERE meta_key = '{$key}'" );
+    $subscriptions = $bbp_db->get_results( "SELECT * FROM {$bbp_db->usermeta} WHERE meta_key = '{$key}'" );
 
     // Bail if no closed topics found
@@ -2300 +2300 @@
 
     // Loop through each user's favorites
-    foreach ( $subscriptions as $meta_id => $meta ) {
+    foreach ( $subscriptions as $meta ) {
 
         // Get post IDs
@@ -2311 +2311 @@
 
             // Skip if already exists
-            if ( $bbp_db->get_var( $bbp_db->prepare( "SELECT COUNT(*) FROM {$bbp_db->postmeta} WHERE post_id = %d AND meta_key = %s AND meta_value = %d" ), $post_id, '_bbp_subscription', $meta->user_id ) ) {
+            if ( $bbp_db->get_var( $bbp_db->prepare( "SELECT COUNT(*) FROM {$bbp_db->postmeta} WHERE post_id = %d AND meta_key = %s AND meta_value = %d", $post_id, '_bbp_subscription', $meta->user_id ) ) ) {
                 continue;
             }
@@ -2327 +2327 @@
         // Delete user meta if everything was copied successfully
         if ( $changed === $to_change ) {
-            delete_metadata_by_mid( 'user', $meta_id );
+            //delete_metadata_by_mid( 'user', $meta->umeta_id );
         }
     }