Skip to:
Content

BuddyPress.org

Changeset 13034


Ignore:
Timestamp:
08/09/2021 10:00:02 AM (5 months 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:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/bp-groups/bp-groups-notifications.php

    r12893 r13034  
    615615                     * @param string $notification_link The permalink for notification.
    616616                     */
    617                     return apply_filters( 'bp_groups_' . $amount . '_' . $action . '_notification', '<a href="' . $notification_link . '">' . $text . '</a>', $total_items, $group->name );
     617                    return apply_filters( 'bp_groups_' . $amount . '_' . $action . '_notification', '<a href="' . $notification_link . '">' . $text . '</a>', $total_items, $group->name, $text, $notification_link );
    618618                } else {
    619619
  • trunk/src/bp-notifications/actions/bulk-manage.php

    r11933 r13034  
    6464    }
    6565
     66    // URL to redirect to.
     67    if ( bp_is_current_action( 'unread' ) ) {
     68        $redirect = bp_get_notifications_unread_permalink( bp_displayed_user_id() );
     69    } elseif ( bp_is_current_action( 'read' ) ) {
     70        $redirect = bp_get_notifications_read_permalink( bp_displayed_user_id() );
     71    }
     72
    6673    // Redirect.
    67     bp_core_redirect( bp_displayed_user_domain() . bp_get_notifications_slug() . '/' . bp_current_action() . '/' );
     74    bp_core_redirect( $redirect );
    6875}
    6976add_action( 'bp_actions', 'bp_notifications_action_bulk_manage' );
  • trunk/src/bp-notifications/actions/delete.php

    r11933 r13034  
    3939    }
    4040
     41    // URL to redirect to.
     42    if ( bp_is_current_action( 'unread' ) ) {
     43        $redirect = bp_get_notifications_unread_permalink( bp_displayed_user_id() );
     44    } elseif ( bp_is_current_action( 'read' ) ) {
     45        $redirect = bp_get_notifications_read_permalink( bp_displayed_user_id() );
     46    }
     47
    4148    // Redirect.
    42     bp_core_redirect( bp_displayed_user_domain() . bp_get_notifications_slug() . '/' . bp_current_action() . '/' );
     49    bp_core_redirect( $redirect );
    4350}
    4451add_action( 'bp_actions', 'bp_notifications_action_delete' );
  • trunk/src/bp-notifications/bp-notifications-template.php

    r12646 r13034  
    158158         * @param int    $user_id The user ID.
    159159         */
    160         return apply_filters( 'bp_get_notifications_unread_permalink', $retval, $user_id );
     160        return apply_filters( 'bp_get_notifications_read_permalink', $retval, $user_id );
    161161    }
    162162
  • trunk/src/bp-notifications/screens/read.php

    r11933 r13034  
    6464
    6565    // Redirect.
    66     bp_core_redirect( bp_displayed_user_domain() . bp_get_notifications_slug() . '/read/' );
     66    bp_core_redirect( bp_get_notifications_read_permalink( bp_displayed_user_id() ) );
    6767}
    6868add_action( 'bp_actions', 'bp_notifications_action_mark_unread' );
  • trunk/src/bp-notifications/screens/unread.php

    r11933 r13034  
    6464
    6565    // Redirect.
    66     bp_core_redirect( bp_displayed_user_domain() . bp_get_notifications_slug() . '/unread/' );
     66    bp_core_redirect( bp_get_notifications_unread_permalink( bp_displayed_user_id() ) );
    6767}
    6868add_action( 'bp_actions', 'bp_notifications_action_mark_read' );
Note: See TracChangeset for help on using the changeset viewer.