<!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][7652] trunk/bp-groups/bp-groups-notifications.php: Groups: Fix invalid arguments for new notification function calls.</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/7652">7652</a></dd>
<dt>Author</dt> <dd>r-a-y</dd>
<dt>Date</dt> <dd>2013-12-07 21:27:45 +0000 (Sat, 07 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Groups: Fix invalid arguments for new notification function calls.
See <a href="http://buddypress.trac.wordpress.org/ticket/5266">#5266</a>, <a href="http://buddypress.trac.wordpress.org/ticket/5282">#5282</a>.
Props imath.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpgroupsbpgroupsnotificationsphp">trunk/bp-groups/bp-groups-notifications.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpgroupsbpgroupsnotificationsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-notifications.php (7651 => 7652)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-notifications.php 2013-12-06 16:35:17 UTC (rev 7651)
+++ trunk/bp-groups/bp-groups-notifications.php 2013-12-07 21:27:45 UTC (rev 7652)
</span><span class="lines">@@ -59,7 +59,13 @@
</span><span class="cx"> function groups_notification_new_membership_request( $requesting_user_id, $admin_id, $group_id, $membership_id ) {
</span><span class="cx">
</span><span class="cx"> if ( bp_is_active( 'notifications' ) ) {
</span><del>- bp_notifications_add_notification( $requesting_user_id, $admin_id, 'groups', 'new_membership_request', $group_id );
</del><ins>+ bp_notifications_add_notification( array(
+ 'user_id' => $admin_id,
+ 'item_id' => $requesting_user_id,
+ 'secondary_item_id' => $group_id,
+ 'component_name' => buddypress()->groups->id,
+ 'component_action' => 'new_membership_request'
+ ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( 'no' == bp_get_user_meta( $admin_id, 'notification_groups_membership_request', true ) )
</span><span class="lines">@@ -110,11 +116,15 @@
</span><span class="cx">
</span><span class="cx"> // Post a screen notification first.
</span><span class="cx"> if ( bp_is_active( 'notifications' ) ) {
</span><del>- if ( $accepted ) {
- bp_notifications_add_notification( $group_id, $requesting_user_id, 'groups', 'membership_request_accepted' );
- } else {
- bp_notifications_add_notification( $group_id, $requesting_user_id, 'groups', 'membership_request_rejected' );
- }
</del><ins>+
+ $type = ! empty( $accepted ) ? 'membership_request_accepted' : 'membership_request_rejected' ;
+
+ bp_notifications_add_notification( array(
+ 'user_id' => $requesting_user_id,
+ 'item_id' => $group_id,
+ 'component_name' => buddypress()->groups->id,
+ 'component_action' => $type
+ ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( 'no' == bp_get_user_meta( $requesting_user_id, 'notification_membership_request_completed', true ) )
</span><span class="lines">@@ -181,7 +191,14 @@
</span><span class="cx">
</span><span class="cx"> // Post a screen notification first.
</span><span class="cx"> if ( bp_is_active( 'notifications' ) ) {
</span><del>- bp_notifications_add_notification( $group_id, $user_id, 'groups', $type );
</del><ins>+ bp_notifications_add_notification( array(
+ 'user_id' => $user_id,
+ 'item_id' => $group_id,
+ 'component_name' => buddypress()->groups->id,
+ 'component_action' => $type,
+ 'date_notified' => bp_core_current_time(),
+ 'is_new' => 1,
+ ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( 'no' == bp_get_user_meta( $user_id, 'notification_groups_admin_promotion', true ) )
</span><span class="lines">@@ -234,7 +251,12 @@
</span><span class="cx">
</span><span class="cx"> // Post a screen notification first.
</span><span class="cx"> if ( bp_is_active( 'notifications' ) ) {
</span><del>- bp_notifications_add_notification( $group->id, $invited_user_id, 'groups', 'group_invite' );
</del><ins>+ bp_notifications_add_notification( array(
+ 'user_id' => $invited_user_id,
+ 'item_id' => $group->id,
+ 'component_name' => buddypress()->groups->id,
+ 'component_action' => 'group_invite'
+ ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( 'no' == bp_get_user_meta( $invited_user_id, 'notification_groups_invite', true ) )
</span><span class="lines">@@ -592,7 +614,7 @@
</span><span class="cx"> */
</span><span class="cx"> function bp_groups_screen_group_admin_requests_mark_notifications( $group_id ) {
</span><span class="cx"> if ( bp_is_active( 'notifications' ) ) {
</span><del>- bp_notifications_mark_notifications_by_type( bp_loggedin_user_id(), $group_id, 'new_membership_request' );
</del><ins>+ bp_notifications_mark_notifications_by_type( bp_loggedin_user_id(), buddypress()->groups->id, 'new_membership_request' );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> add_action( 'groups_screen_group_admin_requests', 'bp_groups_screen_group_admin_requests_mark_notifications', 10 );
</span></span></pre>
</div>
</div>
</body>
</html>