Changeset 6917

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

Location:

trunk

Files:

• bp-activity/bp-activity-notifications.php (modified) (3 diffs)
• bp-friends/bp-friends-notifications.php (modified) (2 diffs)
• bp-groups/bp-groups-notifications.php (modified) (4 diffs)
• bp-messages/bp-messages-notifications.php (modified) (1 diff)

trunk/bp-activity/bp-activity-notifications.php

@@ -96 +96 @@
         }
 
-        $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 */
@@ -171 +174 @@
 ', 'buddypress' ), $poster_name, $content, $thread_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 */
@@ -216 +222 @@
 ', 'buddypress' ), $poster_name, $content, $thread_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 */

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 */

trunk/bp-groups/bp-groups-notifications.php

@@ -88 +88 @@
 ', 'buddypress' ), $requesting_user_name, $group->name, $group_requests, $requesting_user_name, $profile_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 */
@@ -143 +146 @@
     }
 
-    $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 */
@@ -188 +194 @@
 ', 'buddypress' ), $promoted_to, $group->name, $group_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 */
@@ -241 +250 @@
 ', 'buddypress' ), $inviter_name, $group->name, $invites_link, $group_link, $inviter_name, $inviter_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 */

trunk/bp-messages/bp-messages-notifications.php

@@ -62 +62 @@
 ', 'buddypress' ), $sender_name, $subject, $content, $message_link );
 
-            $email_content .= 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' ) ) {
+                $email_content .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
+            }
 
             // Send the message