Ticket #8144: 8144.patch

src/bp-members/bp-members-functions.php

@@ -1760 +1760 @@
                         'meta'           => $usermeta,
                 );
 
-                BP_Signup::add( $args );
+                $signup_id = BP_Signup::add( $args );
 
                 /**
                  * Filters if BuddyPress should send an activation key for a new signup.
@@ -1781 +1781 @@
                         }
 
                         bp_core_signup_send_validation_email( $user_id, $user_email, $activation_key, $salutation );
+                } elseif ( $signup_id ) {
+                        // Trace the fact this signup email was not sent.
+                        $usermeta['sent_date'] = '0000-00-00 00:00:00';
+
+                        BP_Signup::update( array(
+                                'signup_id' => $signup_id,
+                                'meta'      => $usermeta,
+                        ) );
                 }
         }
 

src/bp-members/classes/class-bp-members-admin.php

@@ -2118 +2118 @@
 
                         <ol class="bp-signups-list">
                         <?php foreach ( $signups as $signup ) :
-                                $last_notified = mysql2date( 'Y/m/d g:i:s a', $signup->date_sent );
                                 $profile_field_ids = array();
 
+                                if ( ! $signup->date_sent || '0000-00-00 00:00:00' === $signup->date_sent ) {
+                                        $last_notified = __( 'Unsent', 'buddypress' );
+                                } else {
+                                        $last_notified = mysql2date( 'Y/m/d g:i:s a', $signup->date_sent );
+                                }
+
                                 // Get all xprofile field IDs except field 1.
                                 if ( ! empty( $signup->meta['profile_field_ids'] ) ) {
                                         $profile_field_ids = array_flip( explode( ',', $signup->meta['profile_field_ids'] ) );

src/bp-members/classes/class-bp-members-list-table.php

@@ -313 +313 @@
                 $actions = array();
 
                 $actions['activate'] = sprintf( '<a href="%1$s">%2$s</a>', esc_url( $activate_link ), __( 'Activate', 'buddypress' ) );
-                $actions['resend']   = sprintf( '<a href="%1$s">%2$s</a>', esc_url( $email_link ), __( 'Email', 'buddypress' ) );
+                $actions['resend']   = sprintf( '<a href="%1$s">%2$s</a>', esc_url( $email_link ), _x( 'Email', 'Resend signup activation key', 'buddypress' ) );
 
                 if ( current_user_can( 'delete_users' ) ) {
                         $actions['delete'] = sprintf( '<a href="%1$s" class="delete">%2$s</a>', esc_url( $delete_link ), __( 'Delete', 'buddypress' ) );
@@ -373 +373 @@
          * @param object|null $signup_object The signup data object.
          */
         public function column_date_sent( $signup_object = null ) {
-                echo mysql2date( 'Y/m/d', $signup_object->date_sent );
+                if ( ! $signup_object->date_sent || '0000-00-00 00:00:00' === $signup_object->date_sent ) {
+                        $date_sent = __( 'Unsent', 'buddypress' );
+                } else {
+                        $date_sent = mysql2date( 'Y/m/d', $signup_object->date_sent );
+                }
+
+                echo esc_html( $date_sent );
         }
 
         /**

src/bp-members/classes/class-bp-members-ms-list-table.php

@@ -306 +306 @@
                 $actions = array();
 
                 $actions['activate'] = sprintf( '<a href="%1$s">%2$s</a>', esc_url( $activate_link ), __( 'Activate', 'buddypress' ) );
-                $actions['resend']   = sprintf( '<a href="%1$s">%2$s</a>', esc_url( $email_link    ), __( 'Email',    'buddypress' ) );
+                $actions['resend']   = sprintf( '<a href="%1$s">%2$s</a>', esc_url( $email_link ), _x( 'Email', 'Resend signup activation key', 'buddypress' ) );
 
                 if ( current_user_can( 'delete_users' ) ) {
                         $actions['delete'] = sprintf( '<a href="%1$s" class="delete">%2$s</a>', esc_url( $delete_link ), __( 'Delete', 'buddypress' ) );
@@ -375 +375 @@
                         $date = 'Y/m/d \<\b\r \/\> g:i:s a';
                 }
 
-                echo mysql2date( $date, $signup_object->date_sent );
+                if ( ! $signup_object->date_sent || '0000-00-00 00:00:00' === $signup_object->date_sent ) {
+                        $date_sent = __( 'Unsent', 'buddypress' );
+                } else {
+                        $date_sent = mysql2date( $date, $signup_object->date_sent );
+                }
+
+                echo esc_html( $date_sent );
         }
 
         /**

src/bp-members/classes/class-bp-signup.php

@@ -256 +256 @@
 
                                 if ( ! empty( $signup->meta['count_sent'] ) ) {
                                         $signup->count_sent = absint( $signup->meta['count_sent'] );
+                                } elseif ( isset( $signup->meta['sent_date'] ) && '0000-00-00 00:00:00' === $signup->meta['sent_date'] ) {
+                                        $signup->count_sent = 0;
                                 } else {
                                         $signup->count_sent = 1;
                                 }