Changeset 6534 for trunk/src/includes/admin/tools/upgrade.php

Timestamp:

06/12/2017 09:23:32 PM (8 years ago)

Author:

johnjamesjacoby

Message:

Engagements: Revert part of r6525, and adjust some actions.

• Engagements will need to be "public only" for 2.6, and we can reconsider what private/hidden engagements look like later
• Make sure that engagements are saved before voice counts are done
• Use new is_public style wrapper function for topics & replies where appropriate
• Remove a few current_filter() checks that should no longer be necessary with current action hook implementation
• There may be more clean-up necessary here, but this is required to bring all unit-tests back to passing as they've been written, specifically things hooked to the bbp_insert_topic and bbp_insert_reply hooks

See #3068. Hat-tip netweb.

File:

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

trunk/src/includes/admin/tools/upgrade.php

@@ -178 +178 @@
     $tpt = bbp_get_topic_post_type();
     $rpt = bbp_get_reply_post_type();
+    $pps = bbp_get_public_status_id();
+    $cps = bbp_get_closed_status_id();
     $sql = "INSERT INTO {$bbp_db->postmeta} (post_id, meta_key, meta_value) (
             SELECT postmeta.meta_value, '_bbp_engagement', posts.post_author
@@ -185 +187 @@
                     AND postmeta.meta_key = '_bbp_topic_id'
                 WHERE posts.post_type IN (%s, %s)
+                    AND posts.post_status IN (%s, %s)
                 GROUP BY postmeta.meta_value, posts.post_author)";
 
     // Run the big query
-    $prepare     = $bbp_db->prepare( $sql, $tpt, $rpt );
+    $prepare     = $bbp_db->prepare( $sql, $tpt, $rpt, $pps, $cps );
     $engagements = $bbp_db->query( $prepare );