Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(mailchimp): fatal error with invalid API keys #1690

Merged
merged 9 commits into from
Nov 11, 2024
Merged

fix(mailchimp): fatal error with invalid API keys #1690

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1e3d705
fix(mailchimp): fatal error with invalid API keys
dkoo Oct 31, 2024
76ed5e0
fix: 400 is an error status code too
dkoo Oct 31, 2024
41db9b6
fix: return an error if cache refresh fails
dkoo Nov 1, 2024
f34334f
Update includes/service-providers/mailchimp/class-newspack-newsletter…
dkoo Nov 1, 2024
bb82561
fix: php lint
dkoo Nov 1, 2024
84044fc
fix: clear cache on API key change
dkoo Nov 7, 2024
6d7602e
fix: properly show errors from trying to refresh cache
dkoo Nov 7, 2024
efbef55
fix: add key for all lists error
dkoo Nov 7, 2024
017efcc
fix: avoid PHP deprecated warning
dkoo Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions includes/class-newspack-newsletters-settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,11 @@ private static function render_oauth_authorization() {
private static function render_lists_table() {
$lists = Newspack_Newsletters_Subscription::get_lists();
if ( is_wp_error( $lists ) || empty( $lists ) ) {
?>
<div class="notice notice-error">
<p><?php echo esc_html( is_wp_error( $lists ) ? $lists->get_error_message() : __( 'No list data found.', 'newspack-newsletters' ) ); ?></p>
</div>
<?php
return;
}
?>
Expand Down
2 changes: 1 addition & 1 deletion includes/service-providers/mailchimp/class-newspack-newsletters-mailchimp.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1426,7 +1426,7 @@ public function validate( $result, $preferred_error = null ) {
throw new Exception( esc_html__( 'A Mailchimp error has occurred.', 'newspack-newsletters' ) );
}
}
if ( ! empty( $result['status'] ) && in_array( $result['status'], [ 400, 404 ] ) ) {
if ( ! empty( $result['status'] ) && 400 <= (int) $result['status'] ) {
if ( $preferred_error && ! Newspack_Newsletters::debug_mode() ) {
if ( ! empty( $result['detail'] ) ) {
$preferred_error .= ' ' . $result['detail'];
Expand Down