Changeset 9824

Timestamp:

05/05/2020 01:52:18 AM (6 years ago)

Author:

dd32

Message:

Profiles: When notifing profiles.wordpress.org of activity, strip tags and shortcodes from the title and content.

Additionally, remove support forum replies/topics from the activity feeds when they're Archived.

See #2408.
Fixes #3162, #5194.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-profiles-wp-activity-notifier/wporg-profiles-wp-activity-notifier.php (modified) (6 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-profiles-wp-activity-notifier/wporg-profiles-wp-activity-notifier.php

@@ -45 +45 @@
                 add_action( 'bbp_approved_topic',        array( $this, 'notify_forum_new_topic' )                   );
                 add_action( 'bbp_unapproved_topic',      array( $this, 'notify_forum_remove_topic' )                );
+                add_action( 'wporg_bbp_archived_topic',  array( $this, 'notify_forum_remove_topic' )                );
 
                 // bbPress 2.x reply support
@@ -54 +55 @@
                 add_action( 'bbp_trashed_reply',         array( $this, 'notify_forum_remove_reply' )                );
                 add_action( 'bbp_untrashed_reply',       array( $this, 'notify_forum_new_reply' )                   );
+                add_action( 'wporg_bbp_archived_reply',  array( $this, 'notify_forum_remove_reply' )                );
         }
 
@@ -132 +134 @@
 
                 $content = wp_trim_words(
-                        ( has_excerpt( $post ) ? $post->post_excerpt : $post->post_content ),
+                        strip_shortcodes( has_excerpt( $post ) ? $post->post_excerpt : $post->post_content ),
                         55
                 );
@@ -263 +265 @@
                                 'topic_id'  => $topic_id,
                                 'forum_id'  => bbp_get_topic_forum_id( $topic_id ),
-                                'title'     => bbp_get_topic_title( $topic_id ),
+                                'title'     => strip_tags( bbp_get_topic_title( $topic_id ) ),
                                 'url'       => bbp_get_topic_permalink( $topic_id ),
                                 'message'   => bbp_get_topic_excerpt( $topic_id, 55 ),
@@ -331 +333 @@
                                 'topic_id'  => bbp_get_reply_topic_id( $reply_id ),
                                 'forum_id'  => bbp_get_reply_forum_id( $reply_id ),
-                                'title'     => bbp_get_reply_topic_title( $reply_id ) ,
+                                'title'     => strip_tags( bbp_get_reply_topic_title( $reply_id ) ),
                                 'url'       => bbp_get_reply_url( $reply_id ),
                                 'message'   => $this->get_reply_excerpt( $reply_id, 15 ),
@@ -401 +403 @@
 
                 // Strip tags and surrounding whitespace.
-                $text = trim ( strip_tags( $text ) );
+                $text = trim( strip_tags( $text ) );
+
+                // Strip shortcodes.
+                if ( function_exists( 'strip_shortcodes' ) ) {
+                        $text = strip_shortcodes( $text );
+                }
 
                 // If trimming by chars, behave like a more multibyte-aware