Skip to:
Content

BuddyPress.org

Ticket #4923: 4923.01.patch

File 4923.01.patch, 7.1 KB (added by r-a-y, 11 years ago)
  • bp-activity/bp-activity-notifications.php

    To view and respond to the message, log in and visit: %3$s 
    9595', 'buddypress' ), $poster_name, $content, $message_link );
    9696                }
    9797
    98                 $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
     98                // Only show the disable notifications line if the settings component is enabled
     99                if ( bp_is_active( 'settings' ) ) {
     100                        $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
     101                }
    99102
    100103                /* Send the message */
    101104                $to      = apply_filters( 'bp_activity_at_message_notification_to', $to );
    To view your original update and all comments, log in and visit: %3$s 
    170173---------------------
    171174', 'buddypress' ), $poster_name, $content, $thread_link );
    172175
    173                 $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
     176                // Only show the disable notifications line if the settings component is enabled
     177                if ( bp_is_active( 'settings' ) ) {
     178                        $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
     179                }
    174180
    175181                /* Send the message */
    176182                $to = apply_filters( 'bp_activity_new_comment_notification_to', $to );
    To view the original activity, your comment and all replies, log in and visit: % 
    215221---------------------
    216222', 'buddypress' ), $poster_name, $content, $thread_link );
    217223
    218                 $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
     224                // Only show the disable notifications line if the settings component is enabled
     225                if ( bp_is_active( 'settings' ) ) {
     226                        $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
     227                }
    219228
    220229                /* Send the message */
    221230                $to = apply_filters( 'bp_activity_new_comment_notification_comment_author_to', $to );
  • bp-friends/bp-friends-notifications.php

    To view %3$s\'s profile: %4$s 
    3939---------------------
    4040', 'buddypress' ), $initiator_name, $all_requests_link, $initiator_name, $initiator_link );
    4141
    42         $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
     42        // Only show the disable notifications line if the settings component is enabled
     43        if ( bp_is_active( 'settings' ) ) {
     44                $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
     45        }
    4346
    4447        /* Send the message */
    4548        $to = apply_filters( 'friends_notification_new_request_to', $to );
    To view %2$s\'s profile: %3$s 
    7477---------------------
    7578', 'buddypress' ), $friend_name, $friend_name, $friend_link );
    7679
    77         $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
     80        // Only show the disable notifications line if the settings component is enabled
     81        if ( bp_is_active( 'settings' ) ) {
     82                $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
     83        }
    7884
    7985        /* Send the message */
    8086        $to = apply_filters( 'friends_notification_accepted_request_to', $to );
  • bp-groups/bp-groups-notifications.php

    To view %4$s\'s profile: %5$s 
    8787---------------------
    8888', 'buddypress' ), $requesting_user_name, $group->name, $group_requests, $requesting_user_name, $profile_link );
    8989
    90         $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
     90        // Only show the disable notifications line if the settings component is enabled
     91        if ( bp_is_active( 'settings' ) ) {
     92                $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
     93        }
    9194
    9295        /* Send the message */
    9396        $to      = apply_filters( 'groups_notification_new_membership_request_to', $to );
    To submit another request please log in and visit: %2$s 
    142145', 'buddypress' ), $group->name, $group_link );
    143146        }
    144147
    145         $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
     148        // Only show the disable notifications line if the settings component is enabled
     149        if ( bp_is_active( 'settings' ) ) {
     150                $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
     151        }
    146152
    147153        /* Send the message */
    148154        $to      = apply_filters( 'groups_notification_membership_request_completed_to', $to );
    To view the group please visit: %3$s 
    187193---------------------
    188194', 'buddypress' ), $promoted_to, $group->name, $group_link );
    189195
    190         $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
     196        // Only show the disable notifications line if the settings component is enabled
     197        if ( bp_is_active( 'settings' ) ) {
     198                $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
     199        }
    191200
    192201        /* Send the message */
    193202        $to      = apply_filters( 'groups_notification_promoted_member_to', $to );
    To view %5$s\'s profile visit: %6$s 
    240249---------------------
    241250', 'buddypress' ), $inviter_name, $group->name, $invites_link, $group_link, $inviter_name, $inviter_link );
    242251
    243                 $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
     252                // Only show the disable notifications line if the settings component is enabled
     253                if ( bp_is_active( 'settings' ) ) {
     254                        $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
     255                }
    244256
    245257                /* Send the message */
    246258                $to      = apply_filters( 'groups_notification_group_invites_to', $to );
  • bp-messages/bp-messages-notifications.php

    To view and read your messages please log in and visit: %4$s 
    6161---------------------
    6262', 'buddypress' ), $sender_name, $subject, $content, $message_link );
    6363
    64                         $email_content .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
     64                        // Only show the disable notifications line if the settings component is enabled
     65                        if ( bp_is_active( 'settings' ) ) {
     66                                $email_content .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
     67                        }
    6568
    6669                        // Send the message
    6770                        $email_to      = apply_filters( 'messages_notification_new_message_to',      $email_to );