Changeset 10038

Timestamp:

08/07/2015 02:07:41 PM (9 years ago)

Author:

boonebgorges

Message:

BP_Messages_Thread objects should always have last_message_* properties set.

Previously, they were only set in the context of a template loop.

Props jdgrimes.
Fixes #6580.

Location:

trunk

Files:

• src/bp-messages/bp-messages-template.php (modified) (1 diff)
• src/bp-messages/classes/class-bp-messages-thread.php (modified) (3 diffs)
• tests/phpunit/testcases/messages/class.bp-messages-thread.php (modified) (1 diff)

trunk/src/bp-messages/bp-messages-template.php

@@ -1847 +1847 @@
         $this->thread        = new BP_Messages_Thread( $thread_id, $order, $args );
         $this->message_count = count( $this->thread->messages );
-
-        $last_message_index                 = $this->message_count - 1;
-        $this->thread->last_message_id      = $this->thread->messages[ $last_message_index ]->id;
-        $this->thread->last_message_date    = $this->thread->messages[ $last_message_index ]->date_sent;
-        $this->thread->last_sender_id       = $this->thread->messages[ $last_message_index ]->sender_id;
-        $this->thread->last_message_subject = $this->thread->messages[ $last_message_index ]->subject;
-        $this->thread->last_message_content = $this->thread->messages[ $last_message_index ]->message;
     }
 

trunk/src/bp-messages/classes/class-bp-messages-thread.php

@@ -29 +29 @@
      *
      * @since BuddyPress (1.0.0)
-     * @var object
+     * @var array
      */
     public $messages;
@@ -37 +37 @@
      *
      * @since BuddyPress (1.0.0)
-     * @var object
+     * @var array
      */
     public $recipients;
@@ -164 +164 @@
             $this->messages = array_reverse( $this->messages );
         }
+
+        $last_message_index         = count( $this->messages ) - 1;
+        $this->last_message_id      = $this->messages[ $last_message_index ]->id;
+        $this->last_message_date    = $this->messages[ $last_message_index ]->date_sent;
+        $this->last_sender_id       = $this->messages[ $last_message_index ]->sender_id;
+        $this->last_message_subject = $this->messages[ $last_message_index ]->subject;
+        $this->last_message_content = $this->messages[ $last_message_index ]->message;
 
         foreach ( (array) $this->messages as $key => $message ) {

trunk/tests/phpunit/testcases/messages/class.bp-messages-thread.php

@@ -403 +403 @@
         $this->assertEquals( null, BP_Messages_Thread::is_valid( 999 ) );
     }
+
+    /**
+     * @group last_message
+     */
+    public function test_last_message_populated() {
+        $u1 = $this->factory->user->create();
+        $u2 = $this->factory->user->create();
+
+        $date = bp_core_current_time();
+
+        $t1 = $this->factory->message->create( array(
+            'sender_id' => $u1,
+            'recipients' => array( $u2 ),
+            'subject' => 'Foo',
+            'date_sent' => $date,
+            'content' => 'Bar and baz.',
+        ) );
+
+        $thread = new BP_Messages_Thread( $t1 );
+
+        $this->assertNotNull( $thread->last_message_id );
+        $this->assertEquals( 'Foo', $thread->last_message_subject );
+        $this->assertEquals( $u1, $thread->last_sender_id );
+        $this->assertEquals( $date, $thread->last_message_date );
+        $this->assertEquals( 'Bar and baz.', $thread->last_message_content );
+    }
 }