Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion assets/js/admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -1246,7 +1246,7 @@
.removeClass('sc_connect_oauth_status--ok')
.removeClass('sc_connect_oauth_status--error')
.addClass('sc_connect_oauth_status--disconnected');
statusText.text(message || (connectCfg.strings && connectCfg.strings.oauth_not_connected) || 'Not Connected');
statusText.text((connectCfg.strings && connectCfg.strings.oauth_not_connected) || 'Not Connected');
}

var subtitle = $('.sc_connect_credentials_subtitle').first();
Expand Down
7 changes: 6 additions & 1 deletion includes/functions/admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -793,6 +793,10 @@ function simcal_has_existing_pro_connect_configuration()
return true;
}

if ('1' === (string) get_option('simple_calendar_connect_pro_own_oauth_health_ok', '')) {
return true;
}

if ('' !== trim((string) get_option('simple_calendar_auth_site_token', ''))) {
return true;
}
Expand All @@ -810,8 +814,9 @@ function simcal_has_existing_pro_connect_configuration()
is_array($feeds) && isset($feeds['google-pro']) && is_array($feeds['google-pro']) ? $feeds['google-pro'] : [];
$client_id = trim((string) ($google_pro['client_id'] ?? ''));
$client_secret = trim((string) ($google_pro['client_secret'] ?? ''));
$client_auth = trim((string) ($google_pro['client_auth'] ?? ''));

return '' !== $client_id && '' !== $client_secret;
return '' !== $client_id || '' !== $client_secret || '' !== $client_auth;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "google-calendar-events",
"title": "Simple Calendar",
"description": "Add Google Calendar events to your WordPress site.",
"version": "4.0.2",
"version": "4.0.3",
"license": "GPLv2+",
"homepage": "https://simplecalendar.io",
"repository": {
Expand Down
Loading
Loading