Ticket #8543: 8543.patch

src/bp-groups/bp-groups-notifications.php

@@ -614 +614 @@
                                          * @param string $text              Notification content.
                                          * @param string $notification_link The permalink for notification.
                                          */
-                                        return apply_filters( 'bp_groups_' . $amount . '_' . $action . '_notification', '<a href="' . $notification_link . '">' . $text . '</a>', $total_items, $group->name );
+                                        return apply_filters( 'bp_groups_' . $amount . '_' . $action . '_notification', '<a href="' . $notification_link . '">' . $text . '</a>', $total_items, $group->name, $text, $notification_link );
                                 } else {
 
                                         /**

src/bp-notifications/actions/bulk-manage.php

@@ -63 +63 @@
                 break;
         }
 
+        // URL to redirect to.
+        if ( bp_is_current_action( 'unread' ) ) {
+                $redirect = bp_get_notifications_unread_permalink( bp_displayed_user_id() );
+        } elseif ( bp_is_current_action( 'read' ) ) {
+                $redirect = bp_get_notifications_read_permalink( bp_displayed_user_id() );
+        }
+
         // Redirect.
-        bp_core_redirect( bp_displayed_user_domain() . bp_get_notifications_slug() . '/' . bp_current_action() . '/' );
+        bp_core_redirect( $redirect );
 }
-add_action( 'bp_actions', 'bp_notifications_action_bulk_manage' );
- No newline at end of file
+add_action( 'bp_actions', 'bp_notifications_action_bulk_manage' );

src/bp-notifications/actions/delete.php

@@ -38 +38 @@
                 bp_core_add_message( __( 'There was a problem deleting that notification.', 'buddypress' ), 'error' );
         }
 
+        // URL to redirect to.
+        if ( bp_is_current_action( 'unread' ) ) {
+                $redirect = bp_get_notifications_unread_permalink( bp_displayed_user_id() );
+        } elseif ( bp_is_current_action( 'read' ) ) {
+                $redirect = bp_get_notifications_read_permalink( bp_displayed_user_id() );
+        }
+
         // Redirect.
-        bp_core_redirect( bp_displayed_user_domain() . bp_get_notifications_slug() . '/' . bp_current_action() . '/' );
+        bp_core_redirect( $redirect );
 }
-add_action( 'bp_actions', 'bp_notifications_action_delete' );
- No newline at end of file
+add_action( 'bp_actions', 'bp_notifications_action_delete' );

src/bp-notifications/bp-notifications-template.php

@@ -157 +157 @@
                  * @param string $retval  Permalink for the read notifications.
                  * @param int    $user_id The user ID.
                  */
-                return apply_filters( 'bp_get_notifications_unread_permalink', $retval, $user_id );
+                return apply_filters( 'bp_get_notifications_read_permalink', $retval, $user_id );
         }
 
 /** The Loop ******************************************************************/

src/bp-notifications/screens/read.php

@@ -63 +63 @@
         }
 
         // Redirect.
-        bp_core_redirect( bp_displayed_user_domain() . bp_get_notifications_slug() . '/read/' );
+        bp_core_redirect( bp_get_notifications_read_permalink( bp_displayed_user_id() ) );
 }
-add_action( 'bp_actions', 'bp_notifications_action_mark_unread' );
- No newline at end of file
+add_action( 'bp_actions', 'bp_notifications_action_mark_unread' );

src/bp-notifications/screens/unread.php

@@ -63 +63 @@
         }
 
         // Redirect.
-        bp_core_redirect( bp_displayed_user_domain() . bp_get_notifications_slug() . '/unread/' );
+        bp_core_redirect( bp_get_notifications_unread_permalink( bp_displayed_user_id() ) );
 }
-add_action( 'bp_actions', 'bp_notifications_action_mark_read' );
- No newline at end of file
+add_action( 'bp_actions', 'bp_notifications_action_mark_read' );