Changeset 6917 for trunk/bp-friends/bp-friends-notifications.php

Timestamp:

04/18/2013 12:36:43 AM (12 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

File:

• trunk/bp-friends/bp-friends-notifications.php (modified) (2 diffs)

trunk/bp-friends/bp-friends-notifications.php

@@ -40 +40 @@
 ', 'buddypress' ), $initiator_name, $all_requests_link, $initiator_name, $initiator_link );
 
-    $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
+    // Only show the disable notifications line if the settings component is enabled
+    if ( bp_is_active( 'settings' ) ) {
+        $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
+    }
 
     /* Send the message */
@@ -75 +78 @@
 ', 'buddypress' ), $friend_name, $friend_name, $friend_link );
 
-    $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
+    // Only show the disable notifications line if the settings component is enabled
+    if ( bp_is_active( 'settings' ) ) {
+        $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
+    }
 
     /* Send the message */