Changeset 8616

Timestamp:

07/15/2014 09:59:17 PM (10 years ago)

Author:

johnjamesjacoby

Message:

In messages_format_notifications(), check that thread ID exists before attempting to link to it. Fixes debug notices and incorrect links when a message thread is deleted before notifications are marked as read.

File:

• trunk/src/bp-messages/bp-messages-notifications.php (modified) (3 diffs)

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

@@ -129 +129 @@
 
         if ( (int) $total_items > 1 ) {
-            $text   = sprintf( __('You have %d new messages', 'buddypress' ), (int) $total_items );
+            $text   = sprintf( __( 'You have %d new messages', 'buddypress' ), (int) $total_items );
             $filter = 'bp_messages_multiple_new_message_notification';
         } else {
@@ -135 +135 @@
             $message   = new BP_Messages_Message( $item_id );
             $thread_id = $message->thread_id;
-
-            $link = bp_get_message_thread_view_link( $thread_id );
+            $link      = ( ! empty( $thread_id ) )
+                ? bp_get_message_thread_view_link( $thread_id )
+                : false;
 
             if ( ! empty( $secondary_item_id ) ) {
@@ -148 +149 @@
 
     if ( 'string' === $format ) {
-        $return = apply_filters( $filter, '<a href="' . esc_url( $link ) . '" title="' . esc_attr( $title ) . '">' . esc_html( $text ) . '</a>', (int) $total_items, $text, $link, $item_id, $secondary_item_id );
+        if ( ! empty( $link ) ) {
+            $retval = '<a href="' . esc_url( $link ) . '" title="' . esc_attr( $title ) . '">' . esc_html( $text ) . '</a>';
+        } else {
+            $retval = esc_html( $text );
+        }
+        $return = apply_filters( $filter, $retval, (int) $total_items, $text, $link, $item_id, $secondary_item_id );
     } else {
         $return = apply_filters( $filter, array(