Changeset 13034

Timestamp:

08/09/2021 10:00:02 AM (4 years ago)

Author:

imath

Message:

Notifications: improve Action URLs management & customization

• Use bp_get_notifications_unread_permalink() and bp_get_notifications_read_permalink() to set the Notifications screens/actions redirections instead of rebuilding the redirection URLs from scratch. This lets Advanced users customize the redirection links if needed.
• Add 2 missing variables to the bp_groups_multiple_membership_request_rejected_notification dynamic filter.
• Edit the name of the filter used by the bp_get_notifications_read_permalink() function to be more consistent with the name of the function.

Fixes #8543

Location:

trunk/src

Files:

• bp-groups/bp-groups-notifications.php (modified) (1 diff)
• bp-notifications/actions/bulk-manage.php (modified) (1 diff)
• bp-notifications/actions/delete.php (modified) (1 diff)
• bp-notifications/bp-notifications-template.php (modified) (1 diff)
• bp-notifications/screens/read.php (modified) (1 diff)
• bp-notifications/screens/unread.php (modified) (1 diff)

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

@@ -615 +615 @@
                      * @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 {
 

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

@@ -64 +64 @@
     }
 
+    // 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' );

trunk/src/bp-notifications/actions/delete.php

@@ -39 +39 @@
     }
 
+    // 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' );

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

@@ -158 +158 @@
          * @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 );
     }
 

trunk/src/bp-notifications/screens/read.php

@@ -64 +64 @@
 
     // 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' );

trunk/src/bp-notifications/screens/unread.php

@@ -64 +64 @@
 
     // 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' );