Skip to:
Content

BuddyPress.org

Changeset 6917


Ignore:
Timestamp:
04/18/2013 12:36:43 AM (11 years ago)
Author:
boonebgorges
Message:

Only show the 'to disable' notice in emails if Settings is enabled

Unless Settings is enabled, these links will 404. This is not exactly a
regression, but it has become much more visible in BP 1.7, since the Settings
component is no longer enabled by default.

Fixes #4923

Props r-a-y

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/bp-activity/bp-activity-notifications.php

    r6754 r6917  
    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 */
     
    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 */
     
    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 */
  • trunk/bp-friends/bp-friends-notifications.php

    r6589 r6917  
    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 */
     
    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 */
  • trunk/bp-groups/bp-groups-notifications.php

    r6589 r6917  
    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 */
     
    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 */
     
    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 */
     
    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 */
  • trunk/bp-messages/bp-messages-notifications.php

    r6589 r6917  
    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
Note: See TracChangeset for help on using the changeset viewer.