<!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][6545] trunk/bp-messages: Messages:</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, #logmsg > ol { margin-left: 0; 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/6545">6545</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2012-11-30 23:42:31 +0000 (Fri, 30 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Messages:
* Separate conversation screen logic into dedicated screen function.
* Remove goofy extra sub-nav item when viewing a conversation.
* Manually hook conversation screen into bp_screens() as there is no associated menu item callback.
* Fixes debug notices in theme compat, and brings message conversations up to par with other components and functionality.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpmessagesbpmessagesactionsphp">trunk/bp-messages/bp-messages-actions.php</a></li>
<li><a href="#trunkbpmessagesbpmessagesscreensphp">trunk/bp-messages/bp-messages-screens.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpmessagesbpmessagesactionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-messages/bp-messages-actions.php (6544 => 6545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-messages/bp-messages-actions.php 2012-11-30 23:36:30 UTC (rev 6544)
+++ trunk/bp-messages/bp-messages-actions.php 2012-11-30 23:42:31 UTC (rev 6545)
</span><span class="lines">@@ -14,8 +14,8 @@
</span><span class="cx"> // Exit if accessed directly
</span><span class="cx"> if ( !defined( 'ABSPATH' ) ) exit;
</span><span class="cx">
</span><del>-function messages_action_view_message() {
- global $thread_id, $bp;
</del><ins>+function messages_action_conversation() {
+ global $thread_id;
</ins><span class="cx">
</span><span class="cx"> if ( !bp_is_messages_component() || !bp_is_current_action( 'view' ) )
</span><span class="cx"> return false;
</span><span class="lines">@@ -32,10 +32,11 @@
</span><span class="cx"> check_admin_referer( 'messages_send_message', 'send_message_nonce' );
</span><span class="cx">
</span><span class="cx"> // Send the reply
</span><del>- if ( messages_new_message( array( 'thread_id' => $thread_id, 'subject' => ! empty( $_POST['subject'] ) ? $_POST['subject'] : false, 'content' => $_POST['content'] ) ) )
</del><ins>+ if ( messages_new_message( array( 'thread_id' => $thread_id, 'subject' => ! empty( $_POST['subject'] ) ? $_POST['subject'] : false, 'content' => $_POST['content'] ) ) ) {
</ins><span class="cx"> bp_core_add_message( __( 'Your reply was sent successfully', 'buddypress' ) );
</span><del>- else
</del><ins>+ } else {
</ins><span class="cx"> bp_core_add_message( __( 'There was a problem sending your reply, please try again', 'buddypress' ), 'error' );
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> bp_core_redirect( bp_displayed_user_domain() . bp_get_messages_slug() . '/view/' . $thread_id . '/' );
</span><span class="cx"> }
</span><span class="lines">@@ -43,27 +44,9 @@
</span><span class="cx"> // Mark message read
</span><span class="cx"> messages_mark_thread_read( $thread_id );
</span><span class="cx">
</span><del>- // Decrease the unread count in the nav before it's rendered
- $name = sprintf( __( 'Messages <span>%s</span>', 'buddypress' ), bp_get_total_unread_messages_count() );
-
- $bp->bp_nav[$bp->messages->slug]['name'] = $name;
-
- do_action( 'messages_action_view_message' );
-
- bp_core_new_subnav_item( array(
- 'name' => sprintf( __( 'From: %s', 'buddypress' ), BP_Messages_Thread::get_last_sender( $thread_id ) ),
- 'slug' => 'view',
- 'parent_url' => trailingslashit( bp_displayed_user_domain() . bp_get_messages_slug() ),
- 'parent_slug' => bp_get_messages_slug(),
- 'screen_function' => true,
- 'position' => 40,
- 'user_has_access' => bp_is_my_profile(),
- 'link' => trailingslashit( bp_displayed_user_domain() . bp_get_messages_slug() . '/view/' . (int) $thread_id )
- ) );
-
- bp_core_load_template( apply_filters( 'messages_template_view_message', 'members/single/home' ) );
</del><ins>+ do_action( 'messages_action_conversation' );
</ins><span class="cx"> }
</span><del>-add_action( 'bp_actions', 'messages_action_view_message' );
</del><ins>+add_action( 'bp_actions', 'messages_action_conversation' );
</ins><span class="cx">
</span><span class="cx"> function messages_action_delete_message() {
</span><span class="cx"> global $thread_id;
</span></span></pre></div>
<a id="trunkbpmessagesbpmessagesscreensphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-messages/bp-messages-screens.php (6544 => 6545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-messages/bp-messages-screens.php 2012-11-30 23:36:30 UTC (rev 6544)
+++ trunk/bp-messages/bp-messages-screens.php 2012-11-30 23:42:31 UTC (rev 6545)
</span><span class="lines">@@ -86,6 +86,29 @@
</span><span class="cx"> bp_core_load_template( apply_filters( 'messages_template_compose', 'members/single/home' ) );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+function messages_screen_conversation() {
+
+ // Bail if not viewing a single message
+ if ( !bp_is_messages_component() || !bp_is_current_action( 'view' ) )
+ return false;
+
+ $thread_id = (int) bp_action_variable( 0 );
+
+ if ( empty( $thread_id ) || !messages_is_valid_thread( $thread_id ) || ( !messages_check_thread_access( $thread_id ) && !bp_current_user_can( 'bp_moderate' ) ) )
+ bp_core_redirect( trailingslashit( bp_displayed_user_domain() . bp_get_messages_slug() ) );
+
+ // Load up BuddyPress one time
+ $bp = buddypress();
+
+ // Decrease the unread count in the nav before it's rendered
+ $bp->bp_nav[$bp->messages->slug]['name'] = sprintf( __( 'Messages <span>%s</span>', 'buddypress' ), bp_get_total_unread_messages_count() );
+
+ do_action( 'messages_screen_conversation' );
+
+ bp_core_load_template( apply_filters( 'messages_template_view_message', 'members/single/home' ) );
+}
+add_action( 'bp_screens', 'messages_screen_conversation' );
+
</ins><span class="cx"> function messages_screen_notices() {
</span><span class="cx"> global $notice_id;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>