Changeset 2568531
- Timestamp:
- 07/20/2021 08:27:35 PM (5 years ago)
- Location:
- pmpro-import-members-from-csv
- Files:
-
- 12 edited
- 1 copied
-
tags/v3.1.4 (copied) (copied from pmpro-import-members-from-csv/trunk)
-
tags/v3.1.4/CHANGELOG.md (modified) (1 diff)
-
tags/v3.1.4/README.md (modified) (1 diff)
-
tags/v3.1.4/README.txt (modified) (1 diff)
-
tags/v3.1.4/class.pmpro-import-members.php (modified) (2 diffs)
-
tags/v3.1.4/src/class-data.php (modified) (2 diffs)
-
tags/v3.1.4/src/class-email-templates.php (modified) (1 diff)
-
trunk/CHANGELOG.md (modified) (1 diff)
-
trunk/README.md (modified) (1 diff)
-
trunk/README.txt (modified) (1 diff)
-
trunk/class.pmpro-import-members.php (modified) (2 diffs)
-
trunk/src/class-data.php (modified) (2 diffs)
-
trunk/src/class-email-templates.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
pmpro-import-members-from-csv/tags/v3.1.4/CHANGELOG.md
r2568305 r2568531 6 6 7 7 ## [Unreleased] 8 9 ## v3.1.4 - 2021-07-20 10 - BUG FIX: Shouldn't prepare() the SHOW COLUMNS SQL in get_table_info() (Thomas Sjolshagen) 11 - BUG FIX: Wrong handling of PMPro version info when attempting to send welcome email (Thomas Sjolshagen) 12 - BUG FIX: PHPStan test failed due to missing PMPRO_VERSION constant (Thomas Sjolshagen) 8 13 9 14 ## v3.1.3 - 2021-07-20 -
pmpro-import-members-from-csv/tags/v3.1.4/README.md
r2568305 r2568531 3 3 `Tags: user, users, csv, batch, import, importer, admin, paid memberships pro, members, member, pmpro` <br /> 4 4 `Requires at least: 5.0` <br /> 5 `Tested up to: 5. 7.2` <br />6 `Stable tag: 3.1. 3` <br />5 `Tested up to: 5.8` <br /> 6 `Stable tag: 3.1.4` <br /> 7 7 `License: GPLv2` <br /> 8 8 `License URI: http://www.gnu.org/licenses/gpl` <br /> -
pmpro-import-members-from-csv/tags/v3.1.4/README.txt
r2568305 r2568531 3 3 Tags: user, users, csv, batch, import, importer, admin, paid memberships pro, members, member, pmpro 4 4 Requires at least: 5.0 5 Tested up to: 5. 7.26 Stable tag: 3.1. 35 Tested up to: 5.8 6 Stable tag: 3.1.4 7 7 License: GPLv2 8 8 License URI: http://www.gnu.org/licenses/gpl -
pmpro-import-members-from-csv/tags/v3.1.4/class.pmpro-import-members.php
r2568305 r2568531 4 4 Plugin URI: http://wordpress.org/plugins/pmpro-import-members-from-csv/ 5 5 Description: Import Users and their metadata from a csv file. 6 Version: 3.1. 36 Version: 3.1.4 7 7 Requires PHP: 7.3 8 8 Author: <a href="https://eighty20results.com/thomas-sjolshagen/">Thomas Sjolshagen <[email protected]></a> … … 55 55 56 56 if ( ! defined( 'E20R_IMPORT_VERSION' ) ) { 57 define( 'E20R_IMPORT_VERSION', '3.1. 3' );57 define( 'E20R_IMPORT_VERSION', '3.1.4' ); 58 58 } 59 59 -
pmpro-import-members-from-csv/tags/v3.1.4/src/class-data.php
r2563515 r2568531 262 262 263 263 global $wpdb; 264 265 $columns = $wpdb->get_results( 266 $wpdb->prepare( 267 'SHOW COLUMNS FROM %s', 268 sprintf( '%1$s%2$s', $wpdb->get_blog_prefix(), $table_name ) 269 ) 270 ); 264 $prefix = $wpdb->get_blog_prefix(); 265 $columns = $wpdb->get_results( "SHOW COLUMNS FROM {$prefix}{$table_name}" ); // phpcs:ignore 271 266 $db_columns = array(); 272 267 … … 276 271 277 272 foreach ( $columns as $col ) { 278 279 273 $prefix = null; 280 281 274 switch ( $col->Field ) { // phpcs:ignore 282 275 // Ignore/skip these. -
pmpro-import-members-from-csv/tags/v3.1.4/src/class-email-templates.php
r2568305 r2568531 73 73 $send_email = (bool) $this->variables->get( 'send_welcome_email' ); 74 74 75 // @phpstan-ignore-next-line76 if ( 1 === version_compare( PMPRO_VERSION, '1.9.5' ) ) {75 if ( version_compare( PMPRO_VERSION, '1.9.5', 'le' ) ) { // @phpstan-ignore-line 76 $this->error_log->debug( 'Unable to send email due to the specified PMPro version: ' . PMPRO_VERSION ); 77 77 return false; 78 78 } 79 79 80 80 if ( false === $send_email ) { 81 $this->error_log->debug( 'Not sending email because you asked me not to!' ); 81 82 return false; 82 83 } 83 84 84 85 if ( ! isset( $fields['membership_status'] ) || ( isset( $fields['membership_status'] ) && 'active' !== $fields['membership_status'] ) ) { 86 $this->error_log->debug( "The membership_status field wasn't set to active: {$fields['membership_status']}" ); 85 87 return false; 86 88 } -
pmpro-import-members-from-csv/trunk/CHANGELOG.md
r2568305 r2568531 6 6 7 7 ## [Unreleased] 8 9 ## v3.1.4 - 2021-07-20 10 - BUG FIX: Shouldn't prepare() the SHOW COLUMNS SQL in get_table_info() (Thomas Sjolshagen) 11 - BUG FIX: Wrong handling of PMPro version info when attempting to send welcome email (Thomas Sjolshagen) 12 - BUG FIX: PHPStan test failed due to missing PMPRO_VERSION constant (Thomas Sjolshagen) 8 13 9 14 ## v3.1.3 - 2021-07-20 -
pmpro-import-members-from-csv/trunk/README.md
r2568305 r2568531 3 3 `Tags: user, users, csv, batch, import, importer, admin, paid memberships pro, members, member, pmpro` <br /> 4 4 `Requires at least: 5.0` <br /> 5 `Tested up to: 5. 7.2` <br />6 `Stable tag: 3.1. 3` <br />5 `Tested up to: 5.8` <br /> 6 `Stable tag: 3.1.4` <br /> 7 7 `License: GPLv2` <br /> 8 8 `License URI: http://www.gnu.org/licenses/gpl` <br /> -
pmpro-import-members-from-csv/trunk/README.txt
r2568305 r2568531 3 3 Tags: user, users, csv, batch, import, importer, admin, paid memberships pro, members, member, pmpro 4 4 Requires at least: 5.0 5 Tested up to: 5. 7.26 Stable tag: 3.1. 35 Tested up to: 5.8 6 Stable tag: 3.1.4 7 7 License: GPLv2 8 8 License URI: http://www.gnu.org/licenses/gpl -
pmpro-import-members-from-csv/trunk/class.pmpro-import-members.php
r2568305 r2568531 4 4 Plugin URI: http://wordpress.org/plugins/pmpro-import-members-from-csv/ 5 5 Description: Import Users and their metadata from a csv file. 6 Version: 3.1. 36 Version: 3.1.4 7 7 Requires PHP: 7.3 8 8 Author: <a href="https://eighty20results.com/thomas-sjolshagen/">Thomas Sjolshagen <[email protected]></a> … … 55 55 56 56 if ( ! defined( 'E20R_IMPORT_VERSION' ) ) { 57 define( 'E20R_IMPORT_VERSION', '3.1. 3' );57 define( 'E20R_IMPORT_VERSION', '3.1.4' ); 58 58 } 59 59 -
pmpro-import-members-from-csv/trunk/src/class-data.php
r2563515 r2568531 262 262 263 263 global $wpdb; 264 265 $columns = $wpdb->get_results( 266 $wpdb->prepare( 267 'SHOW COLUMNS FROM %s', 268 sprintf( '%1$s%2$s', $wpdb->get_blog_prefix(), $table_name ) 269 ) 270 ); 264 $prefix = $wpdb->get_blog_prefix(); 265 $columns = $wpdb->get_results( "SHOW COLUMNS FROM {$prefix}{$table_name}" ); // phpcs:ignore 271 266 $db_columns = array(); 272 267 … … 276 271 277 272 foreach ( $columns as $col ) { 278 279 273 $prefix = null; 280 281 274 switch ( $col->Field ) { // phpcs:ignore 282 275 // Ignore/skip these. -
pmpro-import-members-from-csv/trunk/src/class-email-templates.php
r2568305 r2568531 73 73 $send_email = (bool) $this->variables->get( 'send_welcome_email' ); 74 74 75 // @phpstan-ignore-next-line76 if ( 1 === version_compare( PMPRO_VERSION, '1.9.5' ) ) {75 if ( version_compare( PMPRO_VERSION, '1.9.5', 'le' ) ) { // @phpstan-ignore-line 76 $this->error_log->debug( 'Unable to send email due to the specified PMPro version: ' . PMPRO_VERSION ); 77 77 return false; 78 78 } 79 79 80 80 if ( false === $send_email ) { 81 $this->error_log->debug( 'Not sending email because you asked me not to!' ); 81 82 return false; 82 83 } 83 84 84 85 if ( ! isset( $fields['membership_status'] ) || ( isset( $fields['membership_status'] ) && 'active' !== $fields['membership_status'] ) ) { 86 $this->error_log->debug( "The membership_status field wasn't set to active: {$fields['membership_status']}" ); 85 87 return false; 86 88 }
Note: See TracChangeset
for help on using the changeset viewer.