Changeset 2568305
- Timestamp:
- 07/20/2021 02:21:26 PM (5 years ago)
- Location:
- pmpro-import-members-from-csv
- Files:
-
- 10 edited
- 1 copied
-
tags/v3.1.3 (copied) (copied from pmpro-import-members-from-csv/trunk)
-
tags/v3.1.3/CHANGELOG.md (modified) (1 diff)
-
tags/v3.1.3/README.md (modified) (1 diff)
-
tags/v3.1.3/README.txt (modified) (1 diff)
-
tags/v3.1.3/class.pmpro-import-members.php (modified) (2 diffs)
-
tags/v3.1.3/src/class-email-templates.php (modified) (5 diffs)
-
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-email-templates.php (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
pmpro-import-members-from-csv/tags/v3.1.3/CHANGELOG.md
r2565079 r2568305 6 6 7 7 ## [Unreleased] 8 9 ## v3.1.3 - 2021-07-20 10 - BUG FIX: Various fixes to support the new Makefile (Thomas Sjolshagen) 11 - BUG FIX: This plugin doesn't need the metadata.json file (Thomas Sjolshagen) 12 - BUG FIX: Didn't include the deploy target as well as the fixes from the Utilities module (Thomas Sjolshagen) 13 - BUG FIX: Didn't execute email handler code due to bad version check and added e20r_import_message_subject filter to let developer set Subject text for import_email templates (Thomas Sjolshagen) 14 - BUG FIX: Typo in git message - metadata.sh (Thomas Sjolshagen) 15 - BUG FIX: Wrong path to helper_config file in build-plugin.sh (Thomas Sjolshagen) 16 - BUG FIX: Poor git error handling when files haven't changed (Thomas Sjolshagen) 17 - BUG FIX: Wrong order of variables to set correct links, etc. (Thomas Sjolshagen) 18 - BUG FIX: Invalid JSON string for changelog links in metadata.sh template (Thomas Sjolshagen) 19 - BUG FIX: Consume WP_DEPENDENCIES variable as an environment var in wp-deps target (Thomas Sjolshagen) 20 - BUG FIX: Didn't export the wordpress_version variable (Thomas Sjolshagen) 21 - BUG FIX: Missing WordPress version fetch operation from API server (Thomas Sjolshagen) 22 - BUG FIX: Didn't check whether sed was found/assigned (Thomas Sjolshagen) 23 - BUG FIX: Refactor so build target adds documentation as well (Thomas Sjolshagen) 24 - BUG FIX: Updated Makefile in support of new helper scripts (Thomas Sjolshagen) 25 - BUG FIX: Strip real email address from test data (Thomas Sjolshagen) 26 - BUG FIX: Add fixtures and inc directories for codeception tests (Thomas Sjolshagen) 27 - BUG FIX: Refactor the make helper scripts and use plugin specific config file (helper_config) (Thomas Sjolshagen) 28 29 ## v3.1.2 - 2021-07-16 30 - BUG FIX: Updated Makefile in support of new helper scripts (Thomas Sjolshagen) 31 - BUG FIX: Strip real email address from test data (Thomas Sjolshagen) 32 - BUG FIX: Add fixtures and inc directories for codeception tests (Thomas Sjolshagen) 33 - BUG FIX: Refactor the make helper scripts and use plugin specific config file (helper_config) (Thomas Sjolshagen) 8 34 9 35 ## v3.1.1 - 2021-07-15 -
pmpro-import-members-from-csv/tags/v3.1.3/README.md
r2565079 r2568305 4 4 `Requires at least: 5.0` <br /> 5 5 `Tested up to: 5.7.2` <br /> 6 `Stable tag: 3.1. 1` <br />6 `Stable tag: 3.1.3` <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.3/README.txt
r2565079 r2568305 4 4 Requires at least: 5.0 5 5 Tested up to: 5.7.2 6 Stable tag: 3.1. 16 Stable tag: 3.1.3 7 7 License: GPLv2 8 8 License URI: http://www.gnu.org/licenses/gpl -
pmpro-import-members-from-csv/tags/v3.1.3/class.pmpro-import-members.php
r2565079 r2568305 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. 16 Version: 3.1.3 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. 1' );57 define( 'E20R_IMPORT_VERSION', '3.1.3' ); 58 58 } 59 59 -
pmpro-import-members-from-csv/tags/v3.1.3/src/class-email-templates.php
r2565079 r2568305 74 74 75 75 // @phpstan-ignore-next-line 76 if ( 1 !== version_compare( PMPRO_VERSION, '1.9.5' ) ) {76 if ( 1 === version_compare( PMPRO_VERSION, '1.9.5' ) ) { 77 77 return false; 78 78 } … … 87 87 88 88 // Email 'your membership account is active' to the member if they were imported with an active member status 89 90 $subject = null;91 $body = null;89 $template_name = apply_filters( 'e20r_import_welcome_email_template', 'imported_member' ); 90 $subject = pmpro_getOption( "email_{$template_name}_subject" ); 91 $body = pmpro_getOption( "email_{$template_name}_body" ); 92 92 93 93 global $pmproiufcsv_email; … … 98 98 $body = $pmproiufcsv_email['body']; 99 99 } 100 101 $template_name = apply_filters( 'e20r_import_welcome_email_template', 'imported_member' );102 100 103 101 // Apply the saved … … 119 117 $email->data = apply_filters( 'pmp_im_imported_member_message_data', array() ); // @phpstan-ignore-line 120 118 $email->data = apply_filters( 'e20r_import_message_data', $email->data ); 121 $email->subject = $subject; // @phpstan-ignore-line119 $email->subject = apply_filters( 'e20r_import_message_subject', $subject, $email->data ); // @phpstan-ignore-line 122 120 $email->template = $template_name; // @phpstan-ignore-line 123 121 … … 279 277 $pmproet_email_defaults['imported_member'] = array( 280 278 'subject' => __( 'Welcome to my new website', 'pmpro-import-members-from-csv' ), 281 'description' => __( 'Import: Welcome Member', 'pmpro-import-members-from-csv' ),279 'description' => __( 'Import: Welcome Imported Member', 'pmpro-import-members-from-csv' ), 282 280 // phpcs:ignore 283 281 'body' => file_get_contents( Import_Members::$plugin_path . '/emails/imported_member.html' ), -
pmpro-import-members-from-csv/trunk/CHANGELOG.md
r2565079 r2568305 6 6 7 7 ## [Unreleased] 8 9 ## v3.1.3 - 2021-07-20 10 - BUG FIX: Various fixes to support the new Makefile (Thomas Sjolshagen) 11 - BUG FIX: This plugin doesn't need the metadata.json file (Thomas Sjolshagen) 12 - BUG FIX: Didn't include the deploy target as well as the fixes from the Utilities module (Thomas Sjolshagen) 13 - BUG FIX: Didn't execute email handler code due to bad version check and added e20r_import_message_subject filter to let developer set Subject text for import_email templates (Thomas Sjolshagen) 14 - BUG FIX: Typo in git message - metadata.sh (Thomas Sjolshagen) 15 - BUG FIX: Wrong path to helper_config file in build-plugin.sh (Thomas Sjolshagen) 16 - BUG FIX: Poor git error handling when files haven't changed (Thomas Sjolshagen) 17 - BUG FIX: Wrong order of variables to set correct links, etc. (Thomas Sjolshagen) 18 - BUG FIX: Invalid JSON string for changelog links in metadata.sh template (Thomas Sjolshagen) 19 - BUG FIX: Consume WP_DEPENDENCIES variable as an environment var in wp-deps target (Thomas Sjolshagen) 20 - BUG FIX: Didn't export the wordpress_version variable (Thomas Sjolshagen) 21 - BUG FIX: Missing WordPress version fetch operation from API server (Thomas Sjolshagen) 22 - BUG FIX: Didn't check whether sed was found/assigned (Thomas Sjolshagen) 23 - BUG FIX: Refactor so build target adds documentation as well (Thomas Sjolshagen) 24 - BUG FIX: Updated Makefile in support of new helper scripts (Thomas Sjolshagen) 25 - BUG FIX: Strip real email address from test data (Thomas Sjolshagen) 26 - BUG FIX: Add fixtures and inc directories for codeception tests (Thomas Sjolshagen) 27 - BUG FIX: Refactor the make helper scripts and use plugin specific config file (helper_config) (Thomas Sjolshagen) 28 29 ## v3.1.2 - 2021-07-16 30 - BUG FIX: Updated Makefile in support of new helper scripts (Thomas Sjolshagen) 31 - BUG FIX: Strip real email address from test data (Thomas Sjolshagen) 32 - BUG FIX: Add fixtures and inc directories for codeception tests (Thomas Sjolshagen) 33 - BUG FIX: Refactor the make helper scripts and use plugin specific config file (helper_config) (Thomas Sjolshagen) 8 34 9 35 ## v3.1.1 - 2021-07-15 -
pmpro-import-members-from-csv/trunk/README.md
r2565079 r2568305 4 4 `Requires at least: 5.0` <br /> 5 5 `Tested up to: 5.7.2` <br /> 6 `Stable tag: 3.1. 1` <br />6 `Stable tag: 3.1.3` <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
r2565079 r2568305 4 4 Requires at least: 5.0 5 5 Tested up to: 5.7.2 6 Stable tag: 3.1. 16 Stable tag: 3.1.3 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
r2565079 r2568305 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. 16 Version: 3.1.3 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. 1' );57 define( 'E20R_IMPORT_VERSION', '3.1.3' ); 58 58 } 59 59 -
pmpro-import-members-from-csv/trunk/src/class-email-templates.php
r2565079 r2568305 74 74 75 75 // @phpstan-ignore-next-line 76 if ( 1 !== version_compare( PMPRO_VERSION, '1.9.5' ) ) {76 if ( 1 === version_compare( PMPRO_VERSION, '1.9.5' ) ) { 77 77 return false; 78 78 } … … 87 87 88 88 // Email 'your membership account is active' to the member if they were imported with an active member status 89 90 $subject = null;91 $body = null;89 $template_name = apply_filters( 'e20r_import_welcome_email_template', 'imported_member' ); 90 $subject = pmpro_getOption( "email_{$template_name}_subject" ); 91 $body = pmpro_getOption( "email_{$template_name}_body" ); 92 92 93 93 global $pmproiufcsv_email; … … 98 98 $body = $pmproiufcsv_email['body']; 99 99 } 100 101 $template_name = apply_filters( 'e20r_import_welcome_email_template', 'imported_member' );102 100 103 101 // Apply the saved … … 119 117 $email->data = apply_filters( 'pmp_im_imported_member_message_data', array() ); // @phpstan-ignore-line 120 118 $email->data = apply_filters( 'e20r_import_message_data', $email->data ); 121 $email->subject = $subject; // @phpstan-ignore-line119 $email->subject = apply_filters( 'e20r_import_message_subject', $subject, $email->data ); // @phpstan-ignore-line 122 120 $email->template = $template_name; // @phpstan-ignore-line 123 121 … … 279 277 $pmproet_email_defaults['imported_member'] = array( 280 278 'subject' => __( 'Welcome to my new website', 'pmpro-import-members-from-csv' ), 281 'description' => __( 'Import: Welcome Member', 'pmpro-import-members-from-csv' ),279 'description' => __( 'Import: Welcome Imported Member', 'pmpro-import-members-from-csv' ), 282 280 // phpcs:ignore 283 281 'body' => file_get_contents( Import_Members::$plugin_path . '/emails/imported_member.html' ),
Note: See TracChangeset
for help on using the changeset viewer.