Ticket #7084: 7084.01.patch

src/bp-core/bp-core-filters.php

@@ -78 +78 @@
 // Prevent DB query for WP's main loop.
 add_filter( 'posts_pre_query', 'bp_core_filter_wp_query', 10, 2 );
 
+// oEmbeds.
+add_filter( 'bp_embed_oembed_html', 'bp_embed_filter_at_mention_oembed_html' );
+
 /**
  * Prevent specific pages (eg 'Activate') from showing on page listings.
  *

src/bp-core/bp-core-functions.php

@@ -1770 +1770 @@
         return ! empty( $retval ) ? $retval : false;
 }
 
+/**
+ * Replace the "@" sign in oEmbed responses with the HTML equivalent '@'
+ *
+ * If an oEmbed response returns a string such as "This is awesome,
+ * @twitteruser", we shouldn't convert "@twitteruser" into a link. Since our
+ * at-mention filter looks explicitly for the "@" character, let's replace
+ * the "@" character with "@", which ensure our filter will skip these
+ * instances.
+ *
+ * @since 2.7.0
+ *
+ * @param string $retval Current oEmbed HTML.
+ */
+function bp_embed_filter_at_mention_oembed_html( $retval ) {
+        // No "@" sign, so skip!
+        if ( false === strpos( $retval, '@' ) ) {
+                return $retval;
+        }
+
+        return preg_replace( '/@(?![^<]*<\/a>)/', '&#64;', $retval );
+}
+
 /** Admin *********************************************************************/
 
 /**

new file tests/phpunit/testcases/core/functions/bpEmbedFilterAtMentionOEmbedHTML.php

@@ +1 @@
+<?php
+
+/**
+ * @group core
+ * @group functions
+ * @group embed
+ * @group bp_embed_filter_at_mention_oembed_html
+ */
+class BP_Tests_Core_Functions_BPEmbedFilterAtMentionOEmbedHTML extends BP_UnitTestCase {
+
+        public function test_only_replace_non_at_mention_links() {
+                $retval = 'This is an @mention for me.
+
+This is <a href="http://buddypress.org">@shouldnotbeconverted</a>.
+
+This is an @mention for me.';
+
+                $replaced = bp_embed_filter_at_mention_oembed_html( $retval );
+
+                $this->assertFalse( strpos( $replaced, '&#64;shouldnotbeconverted' ) );
+                $this->assertEquals( 2, substr_count( $replaced, '&#64;mention' ) );
+        }
+}