<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[BuddyPress] [3269] trunk/bp-activity/bp-activity-filters.php: Fixes #2632(
trunk) props Paul Gibbs.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3269</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2010-09-13 23:13:20 +0000 (Mon, 13 Sep 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #2632(trunk) props Paul Gibbs. (Also patches missing branch updates from merge.)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityfiltersphp">trunk/bp-activity/bp-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 (3268 => 3269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-filters.php 2010-09-13 23:09:20 UTC (rev 3268)
+++ trunk/bp-activity/bp-activity-filters.php 2010-09-13 23:13:20 UTC (rev 3269)
</span><span class="lines">@@ -1,62 +1,74 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx"> /* Apply WordPress defined filters */
</span><del>-add_filter( 'bp_get_activity_action', 'bp_activity_filter_kses', 1 );
-add_filter( 'bp_get_activity_content_body', 'bp_activity_filter_kses', 1 );
-add_filter( 'bp_get_activity_content', 'bp_activity_filter_kses', 1 );
-add_filter( 'bp_get_activity_parent_content', 'bp_activity_filter_kses', 1 );
-add_filter( 'bp_get_activity_latest_update', 'bp_activity_filter_kses', 1 );
</del><ins>+add_filter( 'bp_get_activity_action', 'bp_activity_filter_kses', 1 );
+add_filter( 'bp_get_activity_content_body', 'bp_activity_filter_kses', 1 );
+add_filter( 'bp_get_activity_content', 'bp_activity_filter_kses', 1 );
+add_filter( 'bp_get_activity_parent_content', 'bp_activity_filter_kses', 1 );
+add_filter( 'bp_get_activity_latest_update', 'bp_activity_filter_kses', 1 );
+add_filter( 'bp_get_activity_latest_update_excerpt', 'bp_activity_filter_kses', 1 );
</ins><span class="cx"> add_filter( 'bp_get_activity_feed_item_description', 'bp_activity_filter_kses', 1 );
</span><del>-add_filter( 'bp_activity_content_before_save', 'bp_activity_filter_kses', 1 );
-add_filter( 'bp_activity_action_before_save', 'bp_activity_filter_kses', 1 );
</del><ins>+add_filter( 'bp_activity_content_before_save', 'bp_activity_filter_kses', 1 );
+add_filter( 'bp_activity_action_before_save', 'bp_activity_filter_kses', 1 );
</ins><span class="cx">
</span><del>-add_filter( 'bp_get_activity_action', 'force_balance_tags' );
-add_filter( 'bp_get_activity_content_body', 'force_balance_tags' );
-add_filter( 'bp_get_activity_content', 'force_balance_tags' );
-add_filter( 'bp_get_activity_latest_update', 'force_balance_tags' );
</del><ins>+add_filter( 'bp_get_activity_action', 'force_balance_tags' );
+add_filter( 'bp_get_activity_content_body', 'force_balance_tags' );
+add_filter( 'bp_get_activity_content', 'force_balance_tags' );
+add_filter( 'bp_get_activity_latest_update', 'force_balance_tags' );
+add_filter( 'bp_get_activity_latest_update_excerpt', 'force_balance_tags' );
</ins><span class="cx"> add_filter( 'bp_get_activity_feed_item_description', 'force_balance_tags' );
</span><ins>+add_filter( 'bp_activity_content_before_save', 'force_balance_tags' );
+add_filter( 'bp_activity_action_before_save', 'force_balance_tags' );
</ins><span class="cx">
</span><del>-add_filter( 'bp_get_activity_action', 'wptexturize' );
-add_filter( 'bp_get_activity_content_body', 'wptexturize' );
-add_filter( 'bp_get_activity_content', 'wptexturize' );
-add_filter( 'bp_get_activity_parent_content', 'wptexturize' );
-add_filter( 'bp_get_activity_latest_update', 'wptexturize' );
</del><ins>+add_filter( 'bp_get_activity_action', 'wptexturize' );
+add_filter( 'bp_get_activity_content_body', 'wptexturize' );
+add_filter( 'bp_get_activity_content', 'wptexturize' );
+add_filter( 'bp_get_activity_parent_content', 'wptexturize' );
+add_filter( 'bp_get_activity_latest_update', 'wptexturize' );
+add_filter( 'bp_get_activity_latest_update_excerpt', 'wptexturize' );
</ins><span class="cx">
</span><del>-add_filter( 'bp_get_activity_action', 'convert_smilies' );
-add_filter( 'bp_get_activity_content_body', 'convert_smilies' );
-add_filter( 'bp_get_activity_content', 'convert_smilies' );
-add_filter( 'bp_get_activity_parent_content', 'convert_smilies' );
-add_filter( 'bp_get_activity_latest_update', 'convert_smilies' );
</del><ins>+add_filter( 'bp_get_activity_action', 'convert_smilies' );
+add_filter( 'bp_get_activity_content_body', 'convert_smilies' );
+add_filter( 'bp_get_activity_content', 'convert_smilies' );
+add_filter( 'bp_get_activity_parent_content', 'convert_smilies' );
+add_filter( 'bp_get_activity_latest_update', 'convert_smilies' );
+add_filter( 'bp_get_activity_latest_update_excerpt', 'convert_smilies' );
</ins><span class="cx">
</span><del>-add_filter( 'bp_get_activity_action', 'convert_chars' );
-add_filter( 'bp_get_activity_content_body', 'convert_chars' );
-add_filter( 'bp_get_activity_content', 'convert_chars' );
-add_filter( 'bp_get_activity_parent_content', 'convert_chars' );
-add_filter( 'bp_get_activity_latest_update', 'convert_chars' );
</del><ins>+add_filter( 'bp_get_activity_action', 'convert_chars' );
+add_filter( 'bp_get_activity_content_body', 'convert_chars' );
+add_filter( 'bp_get_activity_content', 'convert_chars' );
+add_filter( 'bp_get_activity_parent_content', 'convert_chars' );
+add_filter( 'bp_get_activity_latest_update', 'convert_chars' );
+add_filter( 'bp_get_activity_latest_update_excerpt', 'convert_chars' );
</ins><span class="cx">
</span><del>-add_filter( 'bp_get_activity_action', 'wpautop' );
-add_filter( 'bp_get_activity_content_body', 'wpautop' );
-add_filter( 'bp_get_activity_content', 'wpautop' );
</del><ins>+add_filter( 'bp_get_activity_action', 'wpautop' );
+add_filter( 'bp_get_activity_content_body', 'wpautop' );
+add_filter( 'bp_get_activity_content', 'wpautop' );
</ins><span class="cx"> add_filter( 'bp_get_activity_feed_item_description', 'wpautop' );
</span><span class="cx">
</span><del>-add_filter( 'bp_get_activity_action', 'make_clickable' );
-add_filter( 'bp_get_activity_content_body', 'make_clickable' );
-add_filter( 'bp_get_activity_content', 'make_clickable' );
-add_filter( 'bp_get_activity_parent_content', 'make_clickable' );
-add_filter( 'bp_get_activity_latest_update', 'make_clickable' );
</del><ins>+add_filter( 'bp_get_activity_action', 'make_clickable' );
+add_filter( 'bp_get_activity_content_body', 'make_clickable' );
+add_filter( 'bp_get_activity_content', 'make_clickable' );
+add_filter( 'bp_get_activity_parent_content', 'make_clickable' );
+add_filter( 'bp_get_activity_latest_update', 'make_clickable' );
+add_filter( 'bp_get_activity_latest_update_excerpt', 'make_clickable' );
</ins><span class="cx"> add_filter( 'bp_get_activity_feed_item_description', 'make_clickable' );
</span><span class="cx">
</span><del>-add_filter( 'bp_get_activity_action', 'stripslashes_deep' );
-add_filter( 'bp_get_activity_content', 'stripslashes_deep' );
-add_filter( 'bp_get_activity_content_body', 'stripslashes_deep' );
-add_filter( 'bp_get_activity_parent_content', 'stripslashes_deep' );
-add_filter( 'bp_get_activity_latest_update', 'stripslashes_deep' );
</del><ins>+add_filter( 'bp_acomment_name', 'stripslashes_deep' );
+add_filter( 'bp_get_activity_action', 'stripslashes_deep' );
+add_filter( 'bp_get_activity_content', 'stripslashes_deep' );
+add_filter( 'bp_get_activity_content_body', 'stripslashes_deep' );
+add_filter( 'bp_get_activity_parent_content', 'stripslashes_deep' );
+add_filter( 'bp_get_activity_latest_update', 'stripslashes_deep' );
+add_filter( 'bp_get_activity_latest_update_excerpt', 'stripslashes_deep' );
</ins><span class="cx"> add_filter( 'bp_get_activity_feed_item_description', 'stripslashes_deep' );
</span><span class="cx">
</span><del>-add_filter( 'bp_get_activity_content', 'bp_activity_make_nofollow_filter' );
-add_filter( 'bp_get_activity_content_body', 'bp_activity_make_nofollow_filter' );
-add_filter( 'bp_get_activity_parent_content', 'bp_activity_make_nofollow_filter' );
-add_filter( 'bp_get_activity_latest_update', 'bp_activity_make_nofollow_filter' );
</del><ins>+/* Apply BuddyPress defined filters */
+add_filter( 'bp_get_activity_content', 'bp_activity_make_nofollow_filter' );
+add_filter( 'bp_get_activity_content_body', 'bp_activity_make_nofollow_filter' );
+add_filter( 'bp_get_activity_parent_content', 'bp_activity_make_nofollow_filter' );
+add_filter( 'bp_get_activity_latest_update', 'bp_activity_make_nofollow_filter' );
+add_filter( 'bp_get_activity_latest_update_excerpt', 'bp_activity_make_nofollow_filter' );
</ins><span class="cx"> add_filter( 'bp_get_activity_feed_item_description', 'bp_activity_make_nofollow_filter' );
</span><span class="cx">
</span><span class="cx"> add_filter( 'bp_get_activity_parent_content', 'bp_create_excerpt' );
</span><span class="lines">@@ -69,22 +81,22 @@
</span><span class="cx"> global $allowedtags;
</span><span class="cx">
</span><span class="cx"> $activity_allowedtags = $allowedtags;
</span><del>- $activity_allowedtags['span'] = array();
</del><ins>+ $activity_allowedtags['span'] = array();
</ins><span class="cx"> $activity_allowedtags['span']['class'] = array();
</span><del>- $activity_allowedtags['div'] = array();
- $activity_allowedtags['div']['class'] = array();
- $activity_allowedtags['div']['id'] = array();
- $activity_allowedtags['a']['class'] = array();
- $activity_allowedtags['img'] = array();
- $activity_allowedtags['img']['src'] = array();
- $activity_allowedtags['img']['alt'] = array();
- $activity_allowedtags['img']['class'] = array();
- $activity_allowedtags['img']['width'] = array();
</del><ins>+ $activity_allowedtags['div'] = array();
+ $activity_allowedtags['div']['class'] = array();
+ $activity_allowedtags['div']['id'] = array();
+ $activity_allowedtags['a']['class'] = array();
+ $activity_allowedtags['img'] = array();
+ $activity_allowedtags['img']['src'] = array();
+ $activity_allowedtags['img']['alt'] = array();
+ $activity_allowedtags['img']['class'] = array();
+ $activity_allowedtags['img']['width'] = array();
</ins><span class="cx"> $activity_allowedtags['img']['height'] = array();
</span><del>- $activity_allowedtags['img']['class'] = array();
- $activity_allowedtags['img']['id'] = array();
- $activity_allowedtags['img']['title'] = array();
- $activity_allowedtags['code'] = array();
</del><ins>+ $activity_allowedtags['img']['class'] = array();
+ $activity_allowedtags['img']['id'] = array();
+ $activity_allowedtags['img']['title'] = array();
+ $activity_allowedtags['code'] = array();
</ins><span class="cx">
</span><span class="cx"> $activity_allowedtags = apply_filters( 'bp_activity_allowed_tags', $activity_allowedtags );
</span><span class="cx"> return wp_kses( $content, $activity_allowedtags );
</span><span class="lines">@@ -93,10 +105,10 @@
</span><span class="cx"> function bp_activity_at_name_filter( $content ) {
</span><span class="cx"> include_once( ABSPATH . WPINC . '/registration.php' );
</span><span class="cx">
</span><del>- $pattern = '/[@]+([A-Za-z0-9-_]+)/';
</del><ins>+ $pattern = '/[@]+([A-Za-z0-9-_\.]+)/';
</ins><span class="cx"> preg_match_all( $pattern, $content, $usernames );
</span><span class="cx">
</span><del>- /* Make sure there's only one instance of each username */
</del><ins>+ // Make sure there's only one instance of each username
</ins><span class="cx"> if ( !$usernames = array_unique( $usernames[1] ) )
</span><span class="cx"> return $content;
</span><span class="cx">
</span><span class="lines">@@ -104,21 +116,21 @@
</span><span class="cx"> if ( !$user_id = username_exists( $username ) )
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- /* Increase the number of new @ mentions for the user */
- $new_mention_count = (int)get_usermeta( $user_id, 'bp_new_mention_count' );
- update_usermeta( $user_id, 'bp_new_mention_count', $new_mention_count + 1 );
</del><ins>+ // Increase the number of new @ mentions for the user
+ $new_mention_count = (int)get_user_meta( $user_id, 'bp_new_mention_count', true );
+ update_user_meta( $user_id, 'bp_new_mention_count', $new_mention_count + 1 );
</ins><span class="cx">
</span><span class="cx"> $content = str_replace( "@$username", "<a href='" . bp_core_get_user_domain( bp_core_get_userid( $username ) ) . "' rel='nofollow'>@$username</a>", $content );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return $content;
</span><span class="cx"> }
</span><del>-add_filter( 'bp_activity_new_update_content', 'bp_activity_at_name_filter' );
</del><ins>+add_filter( 'bp_activity_new_update_content', 'bp_activity_at_name_filter' );
</ins><span class="cx"> add_filter( 'groups_activity_new_update_content', 'bp_activity_at_name_filter' );
</span><del>-add_filter( 'pre_comment_content', 'bp_activity_at_name_filter' );
</del><ins>+add_filter( 'pre_comment_content', 'bp_activity_at_name_filter' );
</ins><span class="cx"> add_filter( 'group_forum_topic_text_before_save', 'bp_activity_at_name_filter' );
</span><del>-add_filter( 'group_forum_post_text_before_save', 'bp_activity_at_name_filter' );
-add_filter( 'bp_activity_comment_content', 'bp_activity_at_name_filter' );
</del><ins>+add_filter( 'group_forum_post_text_before_save', 'bp_activity_at_name_filter' );
+add_filter( 'bp_activity_comment_content', 'bp_activity_at_name_filter' );
</ins><span class="cx">
</span><span class="cx"> function bp_activity_make_nofollow_filter( $text ) {
</span><span class="cx"> return preg_replace_callback( '|<a (.+?)>|i', 'bp_activity_make_nofollow_filter_callback', $text );
</span><span class="lines">@@ -129,4 +141,4 @@
</span><span class="cx"> return "<a $text rel=\"nofollow\">";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-?>
</del><span class="cx">\ No newline at end of file
</span><ins>+?>
</ins></span></pre>
</div>
</div>
</body>
</html>