<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][7890] trunk: Don't auto-link @mentions that appear inside the context of links</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/7890">7890</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2014-02-16 15:58:37 +0000 (Sun, 16 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't auto-link @mentions that appear inside the context of links
This prevents illegitimate double-linking when text like
href="mailto:foo@bar.com" or <a href="http://twitter.com/bar">@bar</a> happen
to match a BP username like @bar.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/4680">#4680</a>
Props ninnypants</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityfiltersphp">trunk/bp-activity/bp-activity-filters.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkteststestcasesactivityfiltersphp">trunk/tests/testcases/activity/filters.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivityfiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-filters.php (7889 => 7890)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-filters.php 2014-02-15 17:55:14 UTC (rev 7889)
+++ trunk/bp-activity/bp-activity-filters.php 2014-02-16 15:58:37 UTC (rev 7890)
</span><span class="lines">@@ -195,13 +195,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Finds and links @-mentioned users in the contents of a given item.
</del><ins>+ * Find and link @-mentioned users in the contents of a given item.
</ins><span class="cx"> *
</span><del>- * @since BuddyPress (1.2)
</del><ins>+ * @since BuddyPress (1.2.0)
</ins><span class="cx"> *
</span><del>- * @uses bp_activity_find_mentions()
- * @uses bp_core_get_user_domain()
- *
</del><span class="cx"> * @param string $content The contents of a given item.
</span><span class="cx"> * @param int $activity_id The activity id. Deprecated.
</span><span class="cx"> * @return string $content Content filtered for mentions.
</span><span class="lines">@@ -220,11 +217,34 @@
</span><span class="cx"> if ( empty( $usernames ) )
</span><span class="cx"> return $content;
</span><span class="cx">
</span><ins>+ // We don't want to link @mentions that are inside of links, so we
+ // temporarily remove them
+ $replace_count = 0;
+ $replacements = array();
+ foreach ( $usernames as $username ) {
+ // prevent @ name linking inside <a> tags
+ preg_match_all( '/(<a.*?(?!<\/a>)@' . $username . '.*?<\/a>)/', $content, $content_matches );
+ if ( ! empty( $content_matches[1] ) ) {
+ foreach ( $content_matches[1] as $replacement ) {
+ $replacements[ '#BPAN' . $replace_count ] = $replacement;
+ $content = str_replace( $replacement, '#BPAN' . $replace_count, $content );
+ $replace_count++;
+ }
+ }
+ }
+
</ins><span class="cx"> // Linkify the mentions with the username
</span><del>- foreach( (array) $usernames as $user_id => $username ) {
</del><ins>+ foreach ( (array) $usernames as $user_id => $username ) {
</ins><span class="cx"> $content = preg_replace( '/(@' . $username . '\b)/', "<a href='" . bp_core_get_user_domain( $user_id ) . "' rel='nofollow'>@$username</a>", $content );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // put everything back
+ if ( ! empty( $replacements ) ) {
+ foreach ( $replacements as $placeholder => $original ) {
+ $content = str_replace( $placeholder, $original, $content );
+ }
+ }
+
</ins><span class="cx"> // Return the content
</span><span class="cx"> return $content;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkteststestcasesactivityfiltersphp"></a>
<div class="addfile"><h4>Added: trunk/tests/testcases/activity/filters.php (0 => 7890)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/testcases/activity/filters.php (rev 0)
+++ trunk/tests/testcases/activity/filters.php 2014-02-16 15:58:37 UTC (rev 7890)
</span><span class="lines">@@ -0,0 +1,60 @@
</span><ins>+<?php
+
+/**
+ * @group activity
+ */
+class BP_Tests_Activity_Filters extends BP_UnitTestCase {
+ /**
+ * @group mentions
+ * @group bp_activity_at_name_filter
+ */
+ public function test_bp_activity_at_name_filter() {
+ $u1 = $this->create_user( array(
+ 'user_login' => 'foobarbaz',
+ 'user_nicename' => 'foobarbaz',
+ ) );
+
+ $u2 = $this->create_user( array(
+ 'user_login' => 'foo2',
+ 'user_nicename' => 'foo2',
+ ) );
+
+ $u1_mention_name = bp_activity_get_user_mentionname( $u1 );
+ $u1_domain = bp_core_get_user_domain( $u1 );
+ $u2_mention_name = bp_activity_get_user_mentionname( $u2 );
+ $u2_domain = bp_core_get_user_domain( $u2 );
+
+ // mentions normal text should be replaced
+ $at_name_in_text = sprintf( 'Hello @%s', $u1_mention_name );
+ $at_name_in_text_final = "Hello <a href='" . $u1_domain . "' rel='nofollow'>@$u1_mention_name</a>";
+ $this->assertEquals( $at_name_in_text_final, bp_activity_at_name_filter( $at_name_in_text ) );
+
+ // mentions inside links sholudn't be replaced
+ // inside href
+ $at_name_in_mailto = sprintf( "Send messages to <a href='mail@%s.com'>Foo Bar Baz</a>", $u1_mention_name );
+ $at_name_in_mailto_final = sprintf( "Send messages to <a href='mail@%s.com'>Foo Bar Baz</a>", $u1_mention_name );
+ $this->assertEquals( $at_name_in_mailto_final, bp_activity_at_name_filter( $at_name_in_mailto ) );
+
+ // inside linked text
+ $at_name_in_link = sprintf( '<a href="https://twitter.com/%1$s">@%1$s</a>', $u1_mention_name );
+ $at_name_in_link_final = sprintf( '<a href="https://twitter.com/%1$s">@%1$s</a>', $u1_mention_name );
+ $this->assertEquals( $at_name_in_link_final, bp_activity_at_name_filter( $at_name_in_link ) );
+
+ // Don't link non-existent users
+ $text = "Don't link @non @existent @users";
+ $this->assertSame( $text, bp_activity_at_name_filter( $text ) );
+
+ // Don't link the domain name of the site
+ preg_match( '|https?://([^/]+)|', home_url(), $matches );
+ if ( ! empty( $matches[1] ) ) {
+ $text = $matches[1] . " Don't link the domain name " . $matches[1];
+ }
+ $this->assertSame( $text, bp_activity_at_name_filter( $text ) );
+
+ // Multiples
+ $at_name_in_mailto = sprintf( "Send messages to @%s <a href='mail@%s.com'>Foo Bar Baz</a>. Please CC <a href='http://twitter.com/foo2'>@foo2</a>.", $u1_mention_name, $u1_mention_name, $u2_mention_name, $u2_mention_name );
+ $at_name_in_mailto_final = sprintf( 'Send messages to <a href=\'%s\' rel=\'nofollow\'>@%s</a> <a href=\'mail@%s.com\'>Foo Bar Baz</a>. Please CC <a href=\'http://twitter.com/%s\'>@%s</a>.', $u1_domain, $u1_mention_name, $u1_mention_name, $u2_mention_name, $u2_mention_name );
+ $this->assertEquals( $at_name_in_mailto_final, bp_activity_at_name_filter( $at_name_in_mailto ) );
+ }
+
+}
</ins></span></pre>
</div>
</div>
</body>
</html>