<!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][9226] trunk/src/bp-groups: Include updated name/description in email notification after a group is updated.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/9226">9226</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/9226","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2014-12-10 15:50:08 +0000 (Wed, 10 Dec 2014)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Include updated name/description in email notification after a group is updated.
When updating a group's details, there's a checkbox that asks "Notify group
members?". But the notification that goes out does not currently contain any
information about what was changed. The current changeset adds this information
to the email text.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5879">#5879</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpgroupsbpgroupsfunctionsphp">trunk/src/bp-groups/bp-groups-functions.php</a></li>
<li><a href="#trunksrcbpgroupsbpgroupsnotificationsphp">trunk/src/bp-groups/bp-groups-notifications.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpgroupsbpgroupsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-groups/bp-groups-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/bp-groups-functions.php 2014-12-10 15:37:19 UTC (rev 9225)
+++ trunk/src/bp-groups/bp-groups-functions.php 2014-12-10 15:50:08 UTC (rev 9226)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -200,7 +200,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $notify_members ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- groups_notification_group_updated( $group->id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ groups_notification_group_updated( $group->id, $old_group );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcbpgroupsbpgroupsnotificationsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-groups/bp-groups-notifications.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/bp-groups-notifications.php 2014-12-10 15:37:19 UTC (rev 9225)
+++ trunk/src/bp-groups/bp-groups-notifications.php 2014-12-10 15:50:08 UTC (rev 9226)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,10 +21,46 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since BuddyPress (1.0.0)
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $group_id ID of the group.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param BP_Groups_Group $old_group Group before new details were saved.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function groups_notification_group_updated( $group_id = 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function groups_notification_group_updated( $group_id = 0, $old_group = null ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $group = groups_get_group( array( 'group_id' => $group_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $group = groups_get_group( array( 'group_id' => $group_id ) );
+
+ if ( $old_group instanceof BP_Groups_Group ) {
+ $changed = array();
+
+ if ( $group->name !== $old_group->name ) {
+ $changed[] = sprintf(
+ _x( '* Name changed from "%s" to "%s"', 'Group update email text', 'buddypress' ),
+ esc_html( $old_group->name ),
+ esc_html( $group->name )
+ );
+ }
+
+ if ( $group->description !== $old_group->description ) {
+ $changed[] = sprintf(
+ __( '* Description changed from "%s" to "%s"', 'Group update email text', 'buddypress' ),
+ esc_html( $old_group->description ),
+ esc_html( $group->description )
+ );
+ }
+ }
+
+ /**
+ * Filters the bullet points listing updated items in the email notification after a group is updated.
+ *
+ * @since BuddyPress (2.2.0)
+ *
+ * @param array $changed Array of bullet points.
+ */
+ $changed = apply_filters( 'groups_notification_group_update_updated_items', $changed );
+
+ $changed_text = '';
+ if ( ! empty( $changed ) ) {
+ $changed_text = "\n\n" . implode( "\n", $changed );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $subject = bp_get_email_subject( array( 'text' => __( 'Group Details Updated', 'buddypress' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $user_ids = BP_Groups_Member::get_group_member_ids( $group->id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,12 +81,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $settings_link = bp_core_get_user_domain( $user_id ) . $settings_slug . '/notifications/';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $message = sprintf( __(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-'Group details for the group "%1$s" were updated:
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+'Group details for the group "%1$s" were updated: %2$s
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-To view the group: %2$s
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+To view the group: %3$s
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ---------------------
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-', 'buddypress' ), $group->name, $group_link );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+', 'buddypress' ), $group->name, $changed_text, $group_link );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>