<!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] [2290] trunk: Keeping mention screen notifications theme based
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2290</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-01-11 11:53:11 +0000 (Mon, 11 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Keeping mention screen notifications theme based.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivitynotificationsphp">trunk/bp-activity/bp-activity-notifications.php</a></li>
<li><a href="#trunkbpactivityphp">trunk/bp-activity.php</a></li>
<li><a href="#trunkbpgroupsphp">trunk/bp-groups.php</a></li>
<li><a href="#trunkbpthemesbpdefault_incglobaljs">trunk/bp-themes/bp-default/_inc/global.js</a></li>
<li><a href="#trunkbpxprofilephp">trunk/bp-xprofile.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivitynotificationsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-notifications.php (2289 => 2290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-notifications.php 2010-01-11 03:55:43 UTC (rev 2289)
+++ trunk/bp-activity/bp-activity-notifications.php 2010-01-11 11:53:11 UTC (rev 2290)
</span><span class="lines">@@ -15,9 +15,6 @@
</span><span class="cx"> if ( !$receiver_user_id = bp_core_get_userid($username) )
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- // Add a screen notification of an @message
- bp_core_add_notification( $activity_id, $receiver_user_id, $bp->activity->id, 'new_at_mention', $poster_user_id );
-
</del><span class="cx"> // Now email the user with the contents of the message (if they have enabled email notifications)
</span><span class="cx"> if ( !get_usermeta( $user_id, 'notification_activity_new_mention' ) || 'yes' == get_usermeta( $user_id, 'notification_activity_new_mention' ) ) {
</span><span class="cx"> $poster_name = bp_core_get_user_displayname( $poster_user_id );
</span></span></pre></div>
<a id="trunkbpactivityphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity.php (2289 => 2290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity.php 2010-01-11 03:55:43 UTC (rev 2289)
+++ trunk/bp-activity.php 2010-01-11 11:53:11 UTC (rev 2290)
</span><span class="lines">@@ -62,6 +62,7 @@
</span><span class="cx"> $bp->activity->table_name = $wpdb->base_prefix . 'bp_activity';
</span><span class="cx"> $bp->activity->table_name_meta = $wpdb->base_prefix . 'bp_activity_meta';
</span><span class="cx"> $bp->activity->slug = BP_ACTIVITY_SLUG;
</span><ins>+ $bp->activity->format_notification_function = 'bp_activity_format_notifications';
</ins><span class="cx">
</span><span class="cx"> /* Register this in the active components array */
</span><span class="cx"> $bp->active_components[$bp->activity->slug] = $bp->activity->id;
</span><span class="lines">@@ -340,6 +341,7 @@
</span><span class="cx"> }
</span><span class="cx"> add_action( 'wp', 'bp_activity_action_friends_feed', 3 );
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> /********************************************************************************
</span><span class="cx"> * Business Functions
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunkbpgroupsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups.php (2289 => 2290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups.php 2010-01-11 03:55:43 UTC (rev 2289)
+++ trunk/bp-groups.php 2010-01-11 11:53:11 UTC (rev 2290)
</span><span class="lines">@@ -304,8 +304,13 @@
</span><span class="cx"> function groups_screen_my_groups() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->slug, 'member_promoted_to_mod' );
- bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->slug, 'member_promoted_to_admin' );
</del><ins>+ if ( isset($_GET['n']) ) {
+ // Delete group request notifications for the user
+ bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->slug, 'membership_request_accepted' );
+ bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->slug, 'membership_request_rejected' );
+ bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->slug, 'member_promoted_to_mod' );
+ bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->slug, 'member_promoted_to_admin' );
+ }
</ins><span class="cx">
</span><span class="cx"> do_action( 'groups_screen_my_groups' );
</span><span class="cx">
</span><span class="lines">@@ -366,7 +371,7 @@
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><span class="cx"> if ( $bp->is_single_item ) {
</span><del>- if ( isset($_GET['new']) ) {
</del><ins>+ if ( isset($_GET['n']) ) {
</ins><span class="cx"> // Delete group request notifications for the user
</span><span class="cx"> bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->slug, 'membership_request_accepted' );
</span><span class="cx"> bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->slug, 'membership_request_rejected' );
</span><span class="lines">@@ -1446,10 +1451,10 @@
</span><span class="cx"> $group_link = bp_get_group_permalink( $group );
</span><span class="cx">
</span><span class="cx"> if ( (int)$total_items > 1 ) {
</span><del>- return apply_filters( 'bp_groups_multiple_new_membership_requests_notification', '<a href="' . $group_link . '/admin/membership-requests/" title="' . __( 'Group Membership Requests', 'buddypress' ) . '">' . sprintf( __('%d new membership requests for the group "%s"', 'buddypress' ), (int)$total_items, $group->name ) . '</a>', $group_link, $total_items, $group->name );
</del><ins>+ return apply_filters( 'bp_groups_multiple_new_membership_requests_notification', '<a href="' . $group_link . '/admin/membership-requests/?n=1" title="' . __( 'Group Membership Requests', 'buddypress' ) . '">' . sprintf( __('%d new membership requests for the group "%s"', 'buddypress' ), (int)$total_items, $group->name ) . '</a>', $group_link, $total_items, $group->name );
</ins><span class="cx"> } else {
</span><span class="cx"> $user_fullname = bp_core_get_user_displayname( $requesting_user_id );
</span><del>- return apply_filters( 'bp_groups_single_new_membership_request_notification', '<a href="' . $group_link . '/admin/membership-requests/" title="' . $user_fullname .' requests group membership">' . sprintf( __('%s requests membership for the group "%s"', 'buddypress' ), $user_fullname, $group->name ) . '</a>', $group_link, $user_fullname, $group->name );
</del><ins>+ return apply_filters( 'bp_groups_single_new_membership_request_notification', '<a href="' . $group_link . '/admin/membership-requests/?n=1" title="' . $user_fullname .' requests group membership">' . sprintf( __('%s requests membership for the group "%s"', 'buddypress' ), $user_fullname, $group->name ) . '</a>', $group_link, $user_fullname, $group->name );
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="lines">@@ -1457,12 +1462,12 @@
</span><span class="cx"> $group_id = $item_id;
</span><span class="cx">
</span><span class="cx"> $group = new BP_Groups_Group( $group_id, false, false );
</span><del>- $group_link = bp_get_group_permalink( $group ) . '/?new';
</del><ins>+ $group_link = bp_get_group_permalink( $group );
</ins><span class="cx">
</span><span class="cx"> if ( (int)$total_items > 1 ) {
</span><del>- return apply_filters( 'bp_groups_multiple_membership_request_accepted_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __('%d accepted group membership requests', 'buddypress' ), (int)$total_items, $group->name ) . '</a>', $total_items, $group_name );
</del><ins>+ return apply_filters( 'bp_groups_multiple_membership_request_accepted_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '/?n=1" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __('%d accepted group membership requests', 'buddypress' ), (int)$total_items, $group->name ) . '</a>', $total_items, $group_name );
</ins><span class="cx"> } else {
</span><del>- return apply_filters( 'bp_groups_single_membership_request_accepted_notification', '<a href="' . $group_link . '">' . sprintf( __('Membership for group "%s" accepted'), $group->name ) . '</a>', $group_link, $group->name );
</del><ins>+ return apply_filters( 'bp_groups_single_membership_request_accepted_notification', '<a href="' . $group_link . '/?n=1">' . sprintf( __('Membership for group "%s" accepted'), $group->name ) . '</a>', $group_link, $group->name );
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="lines">@@ -1470,12 +1475,12 @@
</span><span class="cx"> $group_id = $item_id;
</span><span class="cx">
</span><span class="cx"> $group = new BP_Groups_Group( $group_id, false, false );
</span><del>- $group_link = bp_get_group_permalink( $group ) . '/?new';
</del><ins>+ $group_link = bp_get_group_permalink( $group );
</ins><span class="cx">
</span><span class="cx"> if ( (int)$total_items > 1 ) {
</span><del>- return apply_filters( 'bp_groups_multiple_membership_request_rejected_notification', '<a href="' . site_url() . '/' . BP_MEMBERS_SLUG . '/' . $bp->groups->slug . '" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __('%d rejected group membership requests', 'buddypress' ), (int)$total_items, $group->name ) . '</a>', $total_items, $group->name );
</del><ins>+ return apply_filters( 'bp_groups_multiple_membership_request_rejected_notification', '<a href="' . site_url() . '/' . BP_MEMBERS_SLUG . '/' . $bp->groups->slug . '/?n=1" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __('%d rejected group membership requests', 'buddypress' ), (int)$total_items, $group->name ) . '</a>', $total_items, $group->name );
</ins><span class="cx"> } else {
</span><del>- return apply_filters( 'bp_groups_single_membership_request_rejected_notification', '<a href="' . $group_link . '">' . sprintf( __('Membership for group "%s" rejected'), $group->name ) . '</a>', $group_link, $group->name );
</del><ins>+ return apply_filters( 'bp_groups_single_membership_request_rejected_notification', '<a href="' . $group_link . '/?n=1">' . sprintf( __('Membership for group "%s" rejected'), $group->name ) . '</a>', $group_link, $group->name );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> break;
</span><span class="lines">@@ -1484,12 +1489,12 @@
</span><span class="cx"> $group_id = $item_id;
</span><span class="cx">
</span><span class="cx"> $group = new BP_Groups_Group( $group_id, false, false );
</span><del>- $group_link = bp_get_group_permalink( $group ) . '/?new';
</del><ins>+ $group_link = bp_get_group_permalink( $group );
</ins><span class="cx">
</span><span class="cx"> if ( (int)$total_items > 1 ) {
</span><del>- return apply_filters( 'bp_groups_multiple_member_promoted_to_admin_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __('You were promoted to an admin in %d groups', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );
</del><ins>+ return apply_filters( 'bp_groups_multiple_member_promoted_to_admin_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '/?n=1" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __('You were promoted to an admin in %d groups', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );
</ins><span class="cx"> } else {
</span><del>- return apply_filters( 'bp_groups_single_member_promoted_to_admin_notification', '<a href="' . $group_link . '">' . sprintf( __('You were promoted to an admin in the group %s'), $group->name ) . '</a>', $group_link, $group->name );
</del><ins>+ return apply_filters( 'bp_groups_single_member_promoted_to_admin_notification', '<a href="' . $group_link . '/?n=1">' . sprintf( __('You were promoted to an admin in the group %s'), $group->name ) . '</a>', $group_link, $group->name );
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="lines">@@ -1497,12 +1502,12 @@
</span><span class="cx"> $group_id = $item_id;
</span><span class="cx">
</span><span class="cx"> $group = new BP_Groups_Group( $group_id, false, false );
</span><del>- $group_link = bp_get_group_permalink( $group ) . '/?new';
</del><ins>+ $group_link = bp_get_group_permalink( $group );
</ins><span class="cx">
</span><span class="cx"> if ( (int)$total_items > 1 ) {
</span><del>- return apply_filters( 'bp_groups_multiple_member_promoted_to_mod_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __('You were promoted to a mod in %d groups', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );
</del><ins>+ return apply_filters( 'bp_groups_multiple_member_promoted_to_mod_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '/?n=1" title="' . __( 'Groups', 'buddypress' ) . '">' . sprintf( __('You were promoted to a mod in %d groups', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );
</ins><span class="cx"> } else {
</span><del>- return apply_filters( 'bp_groups_single_member_promoted_to_mod_notification', '<a href="' . $group_link . '">' . sprintf( __('You were promoted to a mod in the group %s'), $group->name ) . '</a>', $group_link, $group->name );
</del><ins>+ return apply_filters( 'bp_groups_single_member_promoted_to_mod_notification', '<a href="' . $group_link . '/?n=1">' . sprintf( __('You were promoted to a mod in the group %s'), $group->name ) . '</a>', $group_link, $group->name );
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="lines">@@ -1513,9 +1518,9 @@
</span><span class="cx"> $user_url = bp_core_get_domain( $user_id );
</span><span class="cx">
</span><span class="cx"> if ( (int)$total_items > 1 ) {
</span><del>- return apply_filters( 'bp_groups_multiple_group_invite_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '/invites" title="' . __( 'Group Invites', 'buddypress' ) . '">' . sprintf( __('You have %d new group invitations', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );
</del><ins>+ return apply_filters( 'bp_groups_multiple_group_invite_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '/invites/?n=1" title="' . __( 'Group Invites', 'buddypress' ) . '">' . sprintf( __('You have %d new group invitations', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );
</ins><span class="cx"> } else {
</span><del>- return apply_filters( 'bp_groups_single_group_invite_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '/invites" title="' . __( 'Group Invites', 'buddypress' ) . '">' . sprintf( __('You have an invitation to the group: %s', 'buddypress' ), $group->name ) . '</a>', $group->name );
</del><ins>+ return apply_filters( 'bp_groups_single_group_invite_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '/invites/?n=1" title="' . __( 'Group Invites', 'buddypress' ) . '">' . sprintf( __('You have an invitation to the group: %s', 'buddypress' ), $group->name ) . '</a>', $group->name );
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_incglobaljs"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/global.js (2289 => 2290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/global.js 2010-01-11 03:55:43 UTC (rev 2289)
+++ trunk/bp-themes/bp-default/_inc/global.js 2010-01-11 11:53:11 UTC (rev 2290)
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> /* List tabs event delegation */
</span><del>- j('div.activity-type-tabs').click( function(event) {
</del><ins>+ j('div.activity-type-tabs li a').click( function(event) {
</ins><span class="cx"> var target = j(event.target).parent();
</span><span class="cx">
</span><span class="cx"> /* Activity Stream Tabs */
</span></span></pre></div>
<a id="trunkbpxprofilephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile.php (2289 => 2290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile.php 2010-01-11 03:55:43 UTC (rev 2289)
+++ trunk/bp-xprofile.php 2010-01-11 11:53:11 UTC (rev 2290)
</span><span class="lines">@@ -718,16 +718,6 @@
</span><span class="cx"> function xprofile_format_notifications( $action, $item_id, $secondary_item_id, $total_items ) {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- if ( 'new_at_mention' == $action ) {
- $user_fullname = bp_core_get_user_displayname( $secondary_item_id );
-
- if ( (int)$total_items > 1 ) {
- return apply_filters( 'bp_xprofile_multiple_at_mentions_notification', '<a href="' . bp_core_get_user_domain( $secondary_item_id ) . 'activity/" title="' . __( 'View User', 'buddypress' ) . '">' . sprintf( __( '%s mentioned you in %d updates', 'buddypress' ), $user_fullname, (int)$total_items ) . '</a>', $total_items );
- } else {
- return apply_filters( 'bp_xprofile_single_at_mention_notification', '<a href="' . bp_activity_get_permalink( $item_id ) . '" title="' . __( 'View Thread', 'buddypress' ) . '">' . sprintf( __( '%s mentioned you in an update', 'buddypress' ), $user_fullname ) . '</a>', $user_fullname );
- }
- }
-
</del><span class="cx"> if ( 'new_wire_post' == $action ) {
</span><span class="cx"> if ( (int)$total_items > 1 ) {
</span><span class="cx"> return apply_filters( 'bp_xprofile_multiple_new_wire_post_notification', '<a href="' . $bp->loggedin_user->domain . $bp->wire->slug . '" title="' . __( 'Wire', 'buddypress' ) . '">' . sprintf( __( 'You have %d new posts on your wire', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );
</span></span></pre>
</div>
</div>
</body>
</html>