Changeset 2247605

Timestamp:

02/20/2020 02:06:22 PM (6 years ago)

Author:

brewlabs

Message:

Update list user sync for email change

Location:

sendpress/trunk

Files:

• classes/class-sendpress-ajax-loader.php (modified) (1 diff)
• classes/class-sendpress-data.php (modified) (1 diff)
• readme.txt (modified) (2 diffs)
• sendpress.php (modified) (2 diffs)

sendpress/trunk/classes/class-sendpress-ajax-loader.php

@@ -355 +355 @@
         $load   = SendPress_Option::get( 'sync-per-call', 250 );
         
-        $custom = apply_filters('spnl-role-sync-get-user-args', false , $listid , $offset_for_this_run , $number_to_sync_at_once , $role );
+        $custom = apply_filters('spnl-role-sync-get-user-args', false , $listid , $offset , $load , $role );
         if($custom !== false){
             $blogusers = get_users( $custom );

sendpress/trunk/classes/class-sendpress-data.php

@@ -1003 +1003 @@
                 $wpdb->update($table , array('firstname' => $values['firstname'] , 'lastname'=>$values['lastname'], 'wp_user_id'=> $wp_user_id ), array( 'subscriberID' => $current_email ) );
             } else {
-                //Add New
-                $q = "INSERT INTO $table (email,wp_user_id,identity_key,join_date,firstname,lastname) VALUES (%s,%d,%s,%s,%s,%s) ON DUPLICATE KEY UPDATE wp_user_id=%d,firstname=%s,lastname=%s ";
-                $q = $wpdb->prepare($q,$values['email'],$wp_user_id,$key,date('Y-m-d H:i:s'),$values['firstname'],$values['lastname'],$wp_user_id,$values['firstname'],$values['lastname']);
-                $result = $wpdb->query($q);
+                $current_sid = $wpdb->get_var( $wpdb->prepare("SELECT subscriberID FROM $table WHERE wp_user_id = %d", $wp_user_id) );
+                if( $current_sid !== null ){
+                    $wpdb->update($table , array('firstname' => $values['firstname'] , 'lastname'=>$values['lastname'], 'email'=> $values['email'] ), array( 'subscriberID' => $current_sid ) );
+                } else {
+                    //Add New
+                    $q = "INSERT INTO $table (email,wp_user_id,identity_key,join_date,firstname,lastname) VALUES (%s,%d,%s,%s,%s,%s) ON DUPLICATE KEY UPDATE wp_user_id=%d,firstname=%s,lastname=%s ";
+                    $q = $wpdb->prepare($q, $values['email'], $wp_user_id, $key, date('Y-m-d H:i:s'), $values['firstname'], $values['lastname'], $wp_user_id, $values['firstname'], $values['lastname']);
+                    $result = $wpdb->query($q);
+                }
             }
         //}

sendpress/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 4.4
 Tested up to: 5.3.2
-Stable tag: 1.20.1.7
+Stable tag: 1.20.2.20
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -119 +119 @@
 Previous releases can be downloaded from [GitHub](https://github.com/brewlabs/sendpress/releases)
 
+= 1.20.2.20 - 2020.2.20 =
+* fix list sync when user changes email
+
 = 1.20.1.7 - 2020.1.7 =
 * update sync to use custom field on user

sendpress/trunk/sendpress.php

@@ -2 +2 @@
 /*
 Plugin Name: SendPress Newsletters
-Version: 1.20.1.7
+Version: 1.20.2.20
 Plugin URI: https://sendpress.com
 Description: Easy to manage Newsletters for WordPress.
@@ -20 +20 @@
 define( 'SENDPRESS_API_VERSION', 1 );
 define( 'SENDPRESS_MINIMUM_WP_VERSION', '3.6' );
-define( 'SENDPRESS_VERSION', '1.20.1.7' );
+define( 'SENDPRESS_VERSION', '1.20.2.20' );
 define( 'SENDPRESS_URL', plugin_dir_url( __FILE__ ) );
 define( 'SENDPRESS_PATH', plugin_dir_path( __FILE__ ) );