Changeset 10500

Timestamp:

02/03/2016 07:55:29 PM (9 years ago)

Author:

djpaul

Message:

Emails: un-deprecate bp_activity_sent_mention_email action.

All functions where we send an email trigger a final action after the email's sent. The recent changes for BP 2.5's email overhaul moved all of these into the 2.5 backwards compatibility file, which is triggered by the new "email sent" actions and filters in bp_send_email().

Subsequent investigation of all similar actions revealed that only bp_activity_sent_mention_email had core functions hooked to it. Also, bp_activity_sent_mention_email was the only action hook that *always* triggered -- the other similar actions did not trigger if the recipient had chosen to disable email notifications. This change moves the action back into its original location, fixing unit tests and notification functionality, but it does not pass the subject/content/message arguments to the action as we no longer have access to those outside of an BP_Email instance.

Follow-up is required to ensure the 2.5 backwards compatibility code is being loaded correctly, or if this was some quirk of our unit test environment.

See #6592

Location:

trunk/src

Files:

• bp-activity/bp-activity-notifications.php (modified) (1 diff)
• bp-core/deprecated/2.5.php (modified) (3 diffs)

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

@@ -87 +87 @@
         bp_send_email( $email_type, $receiver_user_id, $args );
     }
+
+    /**
+     * Fires after the sending of an @mention email notification.
+     *
+     * @since 1.5.0
+     * @since 2.5.0 $subject, $message, $content arguments unset and deprecated.
+     *
+     * @param BP_Activity_Activity $activity         Activity Item object.
+     * @param string               $deprecated       Removed in 2.5; now an empty string.
+     * @param string               $deprecated       Removed in 2.5; now an empty string.
+     * @param string               $deprecated       Removed in 2.5; now an empty string.
+     * @param int                  $receiver_user_id The ID of the user who is receiving the update.
+     */
+    do_action( 'bp_activity_sent_mention_email', $activity, '', '', '', $receiver_user_id );
 }
 

trunk/src/bp-core/deprecated/2.5.php

@@ -665 +665 @@
 function bp_core_deprecated_email_actions( $email, $delivery_status ) {
     $pre_2_5_emails = array(
-        'activity-at-message',
         'activity-comment',
         'activity-comment-author',
@@ -672 +671 @@
         'friends-request',
         'friends-request-accepted',
-        'groups-at-message',
         'groups-details-updated',
         'groups-invitation',
@@ -726 +724 @@
          */
         do_action( 'bp_activity_sent_reply_to_reply_email', $tokens['parent-comment-user.id'], $email_subject, $email_content, $tokens['comment.id'], $tokens['commenter.id'], array() );
-
-    } elseif ( $email_type === 'activity-at-message' || $email_type === 'groups-at-message' ) {
-        /**
-         * Fires after the sending of an @mention email notification.
-         *
-         * @since 1.5.0
-         * @deprecated 2.5.0 Use the filters in BP_Email.
-         *
-         * @param BP_Activity_Activity $activity         Activity Item object.
-         * @param string               $email_subject    Email notification subject text.
-         * @param string               $email_content    Email notification message text.
-         * @param string               $content          Content of the @mention.
-         * @param int                  $receiver_user_id The ID of the user who is receiving the update.
-         */
-        do_action( 'bp_activity_sent_mention_email', $tokens['activity'], $email_subject, $email_content, $tokens['content'], $tokens['receiver-user.id'] );
 
     } elseif ( $email_type === 'core-user-registration' ) {