Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bbPress Akismet orphan postmeta cleanup infinite loop fix #14

Open
wants to merge 2 commits into
base: trunk
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions src/bbpress.php
Original file line number Diff line number Diff line change
Expand Up @@ -775,17 +775,21 @@ public function register_meta() {
);

/** Post **************************************************************/

$forum = array_merge($count, array('object_subtype' => 'forum'));
$topic = array_merge($count, array('object_subtype' => 'topic'));

// Counts
register_meta( 'post', '_bbp_topic_count', $count );
register_meta( 'post', '_bbp_reply_count', $count );
register_meta( 'post', '_bbp_total_topic_count', $count );
register_meta( 'post', '_bbp_total_reply_count', $count );
register_meta( 'post', '_bbp_voice_count', $count );
register_meta( 'post', '_bbp_anonymous_reply_count', $count );
register_meta( 'post', '_bbp_topic_count_hidden', $count );
register_meta( 'post', '_bbp_reply_count_hidden', $count );
register_meta( 'post', '_bbp_forum_subforum_count', $count );
register_meta( 'post', '_bbp_topic_count', $forum );
register_meta( 'post', '_bbp_reply_count', $forum );
register_meta( 'post', '_bbp_reply_count', $topic );
register_meta( 'post', '_bbp_total_topic_count', $forum );
register_meta( 'post', '_bbp_total_reply_count', $forum );
register_meta( 'post', '_bbp_voice_count', $topic );
register_meta( 'post', '_bbp_anonymous_reply_count', $topic );
register_meta( 'post', '_bbp_topic_count_hidden', $forum );
register_meta( 'post', '_bbp_reply_count_hidden', $forum );
register_meta( 'post', '_bbp_reply_count_hidden', $topic );
register_meta( 'post', '_bbp_forum_subforum_count', $forum );

/* User ***************************************************************/

Expand Down
7 changes: 1 addition & 6 deletions src/includes/extend/akismet.php
Original file line number Diff line number Diff line change
Expand Up @@ -1186,7 +1186,7 @@ public function delete_orphaned_spam_meta() {
$max_exec_time = (float) max( ini_get( 'max_execution_time' ) - 5, 3 );

// Setup the query
$sql = "SELECT m.meta_id, m.post_id, m.meta_key FROM {$wpdb->postmeta} as m LEFT JOIN {$wpdb->posts} as p ON m.post_id = p.ID WHERE p.ID IS NULL AND m.meta_id > %d ORDER BY m.meta_id LIMIT %d";
$sql = "SELECT m.meta_id, m.post_id, m.meta_key FROM {$wpdb->postmeta} as m LEFT JOIN {$wpdb->posts} as p ON m.post_id = p.ID WHERE p.ID IS NULL AND m.meta_id > %d AND (m.meta_key LIKE 'akismet\\_%' OR m.meta_key LIKE '\\_bbp\\_%' ORDER BY m.meta_id LIMIT %d";

// Query loop of topic & reply IDs
while ( $spam_meta_results = $wpdb->get_results( $wpdb->prepare( $sql, $last_meta_id, $delete_limit ) ) ) {
Expand All @@ -1205,11 +1205,6 @@ public function delete_orphaned_spam_meta() {
// Loop through each of the metas
foreach ( $spam_meta_results as $spam_meta ) {

// Skip if not an Akismet key
if ( 'akismet_' !== substr( $spam_meta->meta_key, 0, 8 ) ) {
continue;
}

// Delete the meta
delete_post_meta( $spam_meta->post_id, $spam_meta->meta_key );

Expand Down