Changeset 10540

Timestamp:

02/07/2016 11:10:17 AM (10 years ago)

Author:

djpaul

Message:

Emails: handle PHP Notices in backwards compatibility code when a "to" recipient has not been set for an email.

This shouldn't normally occur, but can in certain failure modes, and in unit tests.

See #6592

File:

• trunk/src/bp-core/deprecated/2.5.php (modified) (2 diffs)

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

@@ -74 +74 @@
 
     $original_value = $value;
-
-    if ( $property === 'to' ) {
+    $to_changed     = false;
+
+    if ( $property === 'to' && $original_value ) {
+        $to_changed     = true;
+
         $value          = array_shift( $original_value );
         $recipient_name = $value->get_name();     // Value - name
@@ -646 +649 @@
     }
 
-    if ( $property === 'to' ) {
-        // We always break apart $to, so we always need to rebuild it.
+    if ( $property === 'to' && $to_changed ) {
+        // We normally apart $to, so we often need to rebuild it.
         array_unshift( $original_value, new BP_Email_Recipient( $value, $recipient_name ) );
         $value = $original_value;