<!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] [1700] trunk: Fixes #837 props DJPaul</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>1700</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2009-08-26 01:04:32 +0000 (Wed, 26 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #837 props DJPaul</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpgroupsbpgroupsnotificationsphp">trunk/bp-groups/bp-groups-notifications.php</a></li>
<li><a href="#trunkbpgroupsphp">trunk/bp-groups.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 (1699 => 1700)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-notifications.php 2009-08-26 00:55:00 UTC (rev 1699)
+++ trunk/bp-groups/bp-groups-notifications.php 2009-08-26 01:04:32 UTC (rev 1700)
</span><span class="lines">@@ -49,7 +49,6 @@
</span><span class="cx"> unset( $message, $to );
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-add_action( 'groups_new_wire_post', 'groups_notification_new_wire_post', 10, 2 );
</del><span class="cx">
</span><span class="cx"> function groups_notification_group_updated( $group_id ) {
</span><span class="cx"> global $bp;
</span></span></pre></div>
<a id="trunkbpgroupsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups.php (1699 => 1700)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups.php 2009-08-26 00:55:00 UTC (rev 1699)
+++ trunk/bp-groups.php 2009-08-26 01:04:32 UTC (rev 1700)
</span><span class="lines">@@ -744,17 +744,15 @@
</span><span class="cx"> if ( !check_admin_referer( 'bp_wire_post' ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if ( !groups_new_wire_post( $bp->groups->current_group->id, $_POST['wire-post-textarea'] ) ) {
</del><ins>+ if ( !groups_new_wire_post( $bp->groups->current_group->id, $_POST['wire-post-textarea'] ) )
</ins><span class="cx"> bp_core_add_message( __('Wire message could not be posted.', 'buddypress'), 'error' );
</span><del>- } else {
</del><ins>+ else
</ins><span class="cx"> bp_core_add_message( __('Wire message successfully posted.', 'buddypress') );
</span><del>- }
</del><span class="cx">
</span><del>- if ( !strpos( $_SERVER['HTTP_REFERER'], $bp->wire->slug ) ) {
</del><ins>+ if ( !strpos( $_SERVER['HTTP_REFERER'], $bp->wire->slug ) )
</ins><span class="cx"> bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) );
</span><del>- } else {
</del><ins>+ else
</ins><span class="cx"> bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) . '/' . $bp->wire->slug );
</span><del>- }
</del><span class="cx">
</span><span class="cx"> } else if ( 'delete' == $wire_action && groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) ) {
</span><span class="cx"> $wire_message_id = $bp->action_variables[1];
</span><span class="lines">@@ -763,17 +761,15 @@
</span><span class="cx"> if ( !check_admin_referer( 'bp_wire_delete_link' ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if ( !groups_delete_wire_post( $wire_message_id, $bp->groups->table_name_wire ) ) {
</del><ins>+ if ( !groups_delete_wire_post( $wire_message_id, $bp->groups->table_name_wire ) )
</ins><span class="cx"> bp_core_add_message( __('There was an error deleting the wire message.', 'buddypress'), 'error' );
</span><del>- } else {
</del><ins>+ else
</ins><span class="cx"> bp_core_add_message( __('Wire message successfully deleted.', 'buddypress') );
</span><del>- }
</del><span class="cx">
</span><del>- if ( !strpos( $_SERVER['HTTP_REFERER'], $bp->wire->slug ) ) {
</del><ins>+ if ( !strpos( $_SERVER['HTTP_REFERER'], $bp->wire->slug ) )
</ins><span class="cx"> bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) );
</span><del>- } else {
</del><ins>+ else
</ins><span class="cx"> bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) . '/' . $bp->wire->slug );
</span><del>- }
</del><span class="cx">
</span><span class="cx"> } else if ( ( !$wire_action || 'latest' == $bp->action_variables[1] ) ) {
</span><span class="cx"> if ( file_exists( TEMPLATEPATH . '/groups/single/wire.php' ) )
</span><span class="lines">@@ -1348,7 +1344,8 @@
</span><span class="cx">
</span><span class="cx"> if ( !function_exists( 'bp_activity_add' ) )
</span><span class="cx"> return false;
</span><del>-
</del><ins>+
+ /* If the group is not public, no recording of activity please. */
</ins><span class="cx"> if ( 'public' != $bp->groups->current_group->status )
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -1927,6 +1924,12 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if ( $wire_post = bp_wire_new_post( $group_id, $content, 'groups' ) ) {
</span><ins>+
+ /* Post an email notification if settings allow */
+ require_once ( BP_PLUGIN_DIR . '/bp-groups/bp-groups-notifications.php' );
+ groups_notification_new_wire_post( $group_id, $wire_post->id );
+
+ /* Record this in activity streams */
</ins><span class="cx"> $activity_content = sprintf( __( '%s wrote on the wire of the group %s:', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' );
</span><span class="cx"> $activity_content .= '<blockquote>' . bp_create_excerpt( attribute_escape( $content ) ) . '</blockquote>';
</span><span class="cx">
</span><span class="lines">@@ -1938,7 +1941,7 @@
</span><span class="cx"> 'secondary_item_id' => $bp->groups->current_group->id
</span><span class="cx"> ) );
</span><span class="cx">
</span><del>- do_action( 'groups_new_wire_post', $group_id, $wire_post_id );
</del><ins>+ do_action( 'groups_new_wire_post', $group_id, $wire_post->id );
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>