Changeset 6545

Timestamp:

11/30/2012 11:42:31 PM (13 years ago)

Author:

johnjamesjacoby

Message:

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.

Location:

trunk/bp-messages

Files:

• bp-messages-actions.php (modified) (3 diffs)
• bp-messages-screens.php (modified) (1 diff)

trunk/bp-messages/bp-messages-actions.php

@@ -15 +15 @@
 if ( !defined( 'ABSPATH' ) ) exit;
 
-function messages_action_view_message() {
-    global $thread_id, $bp;
+function messages_action_conversation() {
+    global $thread_id;
 
     if ( !bp_is_messages_component() || !bp_is_current_action( 'view' ) )
@@ -33 +33 @@
 
         // Send the reply
-        if ( messages_new_message( array( 'thread_id' => $thread_id, 'subject' => ! empty( $_POST['subject'] ) ? $_POST['subject'] : false, 'content' => $_POST['content'] ) ) )
+        if ( messages_new_message( array( 'thread_id' => $thread_id, 'subject' => ! empty( $_POST['subject'] ) ? $_POST['subject'] : false, 'content' => $_POST['content'] ) ) ) {
             bp_core_add_message( __( 'Your reply was sent successfully', 'buddypress' ) );
-        else
+        } else {
             bp_core_add_message( __( 'There was a problem sending your reply, please try again', 'buddypress' ), 'error' );
+        }
 
         bp_core_redirect( bp_displayed_user_domain() . bp_get_messages_slug() . '/view/' . $thread_id . '/' );
@@ -44 +45 @@
     messages_mark_thread_read( $thread_id );
 
-    // 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' ) );
+    do_action( 'messages_action_conversation' );
 }
-add_action( 'bp_actions', 'messages_action_view_message' );
+add_action( 'bp_actions', 'messages_action_conversation' );
 
 function messages_action_delete_message() {

trunk/bp-messages/bp-messages-screens.php

@@ -87 +87 @@
 }
 
+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' );
+
 function messages_screen_notices() {
     global $notice_id;