diff --git a/src/bp-activity/bp-activity-notifications.php b/src/bp-activity/bp-activity-notifications.php index 63e3cf222..e98050496 100644 --- a/src/bp-activity/bp-activity-notifications.php +++ b/src/bp-activity/bp-activity-notifications.php @@ -339,3 +339,75 @@ function bp_activity_add_notification_for_synced_blog_comment( $activity_id, $po } } add_action( 'bp_blogs_comment_sync_activity_comment', 'bp_activity_add_notification_for_synced_blog_comment', 10, 4 ); + +/** + * Add activity notifications settings to the notifications settings page. + * + * @since 1.2.0 + */ +function bp_activity_screen_notification_settings() { + if ( bp_activity_do_mentions() ) { + if ( ! $mention = bp_get_user_meta( bp_displayed_user_id(), 'notification_activity_new_mention', true ) ) { + $mention = 'yes'; + } + } + + if ( ! $reply = bp_get_user_meta( bp_displayed_user_id(), 'notification_activity_new_reply', true ) ) { + $reply = 'yes'; + } + + ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + tag for activity screen notification settings. + * + * @since 1.2.0 + */ + do_action( 'bp_activity_screen_notification_settings' ) ?> + +
 
 />/>
 />/>
+ +path . 'bp-activity/screens/settings-email.php'; - } } /** diff --git a/src/bp-activity/screens/settings-email.php b/src/bp-activity/screens/settings-email.php deleted file mode 100644 index c97dffb54..000000000 --- a/src/bp-activity/screens/settings-email.php +++ /dev/null @@ -1,83 +0,0 @@ - Email" screen - * - * @package BuddyPress - * @subpackage ActivityScreens - * @since 3.0.0 - */ - -// Exit if accessed directly. -defined( 'ABSPATH' ) || exit; - -/** - * Add activity notifications settings to the notifications settings page. - * - * @since 1.2.0 - */ -function bp_activity_screen_notification_settings() { - if ( bp_activity_do_mentions() ) { - if ( ! $mention = bp_get_user_meta( bp_displayed_user_id(), 'notification_activity_new_mention', true ) ) { - $mention = 'yes'; - } - } - - if ( ! $reply = bp_get_user_meta( bp_displayed_user_id(), 'notification_activity_new_reply', true ) ) { - $reply = 'yes'; - } - - ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - tag for activity screen notification settings. - * - * @since 1.2.0 - */ - do_action( 'bp_activity_screen_notification_settings' ) ?> - -
 
 />/>
 />/>
- -friends->id, 'friendship_request' ); } add_action( 'friends_remove_data', 'bp_friends_remove_notifications_data', 10, 1 ); + +/** + * Add Friends-related settings to the Settings > Notifications page. + * + * @since 1.0.0 + */ +function friends_screen_notification_settings() { + + if ( !$send_requests = bp_get_user_meta( bp_displayed_user_id(), 'notification_friends_friendship_request', true ) ) + $send_requests = 'yes'; + + if ( !$accept_requests = bp_get_user_meta( bp_displayed_user_id(), 'notification_friends_friendship_accepted', true ) ) + $accept_requests = 'yes'; ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
/>/>
/>/>
+ +path . 'bp-friends/screens/requests.php'; } } - - // Settings. - if ( bp_is_user_settings_notifications() ) { - require $this->path . 'bp-friends/screens/settings-email.php'; - } } /** diff --git a/src/bp-friends/screens/settings-email.php b/src/bp-friends/screens/settings-email.php deleted file mode 100644 index b4d0f2c3c..000000000 --- a/src/bp-friends/screens/settings-email.php +++ /dev/null @@ -1,73 +0,0 @@ - Email" screen - * - * @package BuddyPress - * @subpackage FriendsScreens - * @since 3.0.0 - */ - -/** - * Add Friends-related settings to the Settings > Notifications page. - * - * @since 1.0.0 - */ -function friends_screen_notification_settings() { - - if ( !$send_requests = bp_get_user_meta( bp_displayed_user_id(), 'notification_friends_friendship_request', true ) ) - $send_requests = 'yes'; - - if ( !$accept_requests = bp_get_user_meta( bp_displayed_user_id(), 'notification_friends_friendship_accepted', true ) ) - $accept_requests = 'yes'; ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
/>/>
/>/>
- - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
/>/>
/>/>
/>/>
/>/>
/>/>
+ +path . 'bp-groups/screens/user/settings-email.php'; - } } /** diff --git a/src/bp-groups/screens/user/settings-email.php b/src/bp-groups/screens/user/settings-email.php deleted file mode 100644 index ecfc7be9d..000000000 --- a/src/bp-groups/screens/user/settings-email.php +++ /dev/null @@ -1,120 +0,0 @@ - Email" screen - * - * @package BuddyPress - * @subpackage GroupScreens - * @since 3.0.0 - */ - -/** - * Render the group settings fields on the Notification Settings page. - * - * @since 1.0.0 - */ -function groups_screen_notification_settings() { - - if ( !$group_invite = bp_get_user_meta( bp_displayed_user_id(), 'notification_groups_invite', true ) ) - $group_invite = 'yes'; - - if ( !$group_update = bp_get_user_meta( bp_displayed_user_id(), 'notification_groups_group_updated', true ) ) - $group_update = 'yes'; - - if ( !$group_promo = bp_get_user_meta( bp_displayed_user_id(), 'notification_groups_admin_promotion', true ) ) - $group_promo = 'yes'; - - if ( !$group_request = bp_get_user_meta( bp_displayed_user_id(), 'notification_groups_membership_request', true ) ) - $group_request = 'yes'; - - if ( ! $group_request_completed = bp_get_user_meta( bp_displayed_user_id(), 'notification_membership_request_completed', true ) ) { - $group_request_completed = 'yes'; - } - ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
/>/>
/>/>
/>/>
/>/>
/>/>
- - Notifications. + * + * @since 1.0.0 + */ +function messages_screen_notification_settings() { + + if ( bp_action_variables() ) { + bp_do_404(); + return; + } + + if ( !$new_messages = bp_get_user_meta( bp_displayed_user_id(), 'notification_messages_new_message', true ) ) { + $new_messages = 'yes'; + } ?> + + + + + + + + + + + + + + + + + + + + tag for messages screen notification settings. + * + * @since 1.0.0 + */ + do_action( 'messages_screen_notification_settings' ); ?> + +
/>/>
+ +path . 'bp-messages/screens/settings-email.php'; - } } /** diff --git a/src/bp-messages/screens/settings-email.php b/src/bp-messages/screens/settings-email.php deleted file mode 100644 index 094f13c7b..000000000 --- a/src/bp-messages/screens/settings-email.php +++ /dev/null @@ -1,63 +0,0 @@ - Email" screen - * - * @package BuddyPress - * @subpackage MessageScreens - * @since 3.0.0 - */ - -/** - * Render the markup for the Messages section of Settings > Notifications. - * - * @since 1.0.0 - */ -function messages_screen_notification_settings() { - - if ( bp_action_variables() ) { - bp_do_404(); - return; - } - - if ( !$new_messages = bp_get_user_meta( bp_displayed_user_id(), 'notification_messages_new_message', true ) ) { - $new_messages = 'yes'; - } ?> - - - - - - - - - - - - - - - - - - - - tag for messages screen notification settings. - * - * @since 1.0.0 - */ - do_action( 'messages_screen_notification_settings' ); ?> - -
/>/>
- -