Changeset 6148

Timestamp:

06/29/2012 03:23:27 PM (13 years ago)

Author:

boonebgorges

Message:

Fixes fatal error in group invite notification when Settings is disabled

groups_notification_group_invites() assembles an email notification that
includes a link to the user settings page. This link cannot be directly
concatenated using bp_get_settings_slug(), since the latter function is not
defined when Settings is disabled.

Fixes #4311

Props Spitzohr

File:

• branches/1.5/bp-groups/bp-groups-notifications.php (modified) (1 diff)

branches/1.5/bp-groups/bp-groups-notifications.php

@@ -219 +219 @@
             return false;
 
-        $invited_ud = bp_core_get_core_userdata($invited_user_id);
-
-        $settings_link = bp_core_get_user_domain( $invited_user_id ) . bp_get_settings_slug() . '/notifications/';
-        $invited_link = bp_core_get_user_domain( $invited_user_id );
-        $invites_link = $invited_link . bp_get_groups_slug() . '/invites';
+        $invited_ud    = bp_core_get_core_userdata($invited_user_id);
+        $settings_slug = function_exists( 'bp_get_settings_slug' ) ? bp_get_settings_slug() : 'settings';
+        $settings_link = bp_core_get_user_domain( $invited_user_id ) . $settings_slug . '/notifications/';
+        $invited_link  = bp_core_get_user_domain( $invited_user_id );
+        $invites_link  = trailingslashit( $invited_link . bp_get_groups_slug() . '/invites' );
 
         // Set up and send the message