From de89d46a4eafb1ffe3571bf5d4c9601fa2f6f3dd Mon Sep 17 00:00:00 2001 From: Andy Fragen Date: Fri, 18 Oct 2024 12:36:20 -0700 Subject: [PATCH 1/4] fix if get_preferred_from_update_core() returns false on recheck --- CHANGES.md | 1 + src/WPBT/WP_Beta_Tester.php | 4 ++++ wp-beta-tester.php | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 7526c52..cf2b628 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,4 +1,5 @@ [unreleased] +* fix if `get_preferred_from_update_core()` continues to return `false` #### 3.6.0 / 2024-10-09 * remove Report a Bug in favor of using the standalone Test Reports plugin diff --git a/src/WPBT/WP_Beta_Tester.php b/src/WPBT/WP_Beta_Tester.php index 3ff234a..b6a958e 100644 --- a/src/WPBT/WP_Beta_Tester.php +++ b/src/WPBT/WP_Beta_Tester.php @@ -225,6 +225,10 @@ public function get_preferred_from_update_core() { if ( false === $preferred ) { wp_version_check(); $preferred = get_preferred_from_update_core(); + if ( ! is_object( $preferred ) ) { + $preferred = new \stdClass(); + $preferred->version = '0'; + } } return $preferred; diff --git a/wp-beta-tester.php b/wp-beta-tester.php index bc5dc8b..33cb66b 100644 --- a/wp-beta-tester.php +++ b/wp-beta-tester.php @@ -13,7 +13,7 @@ * Plugin URI: https://wordpress.org/plugins/wordpress-beta-tester/ * Description: Allows you to easily upgrade to Beta releases. * Author: WordPress Upgrade/Install Team - * Version: 3.6.0 + * Version: 3.6.0.1 * Network: true * Author URI: https://make.wordpress.org/core/components/upgrade-install/ * Text Domain: wordpress-beta-tester From 245fd7e01afa09bdbfe3413999ccfbeac09aa739 Mon Sep 17 00:00:00 2001 From: Andy Fragen Date: Fri, 18 Oct 2024 13:22:40 -0700 Subject: [PATCH 2/4] better fix if get_preferred_from_update_core() returns false --- src/WPBT/WP_Beta_Tester.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/WPBT/WP_Beta_Tester.php b/src/WPBT/WP_Beta_Tester.php index b6a958e..f0b7da3 100644 --- a/src/WPBT/WP_Beta_Tester.php +++ b/src/WPBT/WP_Beta_Tester.php @@ -225,12 +225,17 @@ public function get_preferred_from_update_core() { if ( false === $preferred ) { wp_version_check(); $preferred = get_preferred_from_update_core(); - if ( ! is_object( $preferred ) ) { - $preferred = new \stdClass(); - $preferred->version = '0'; - } } + // get_preferred_from_update_core() can return false. + if ( false === $preferred ) { + $preferred['response'] = 'latest'; + $preferred['version'] = '0'; + $preferred = (object) $preferred; + } + + $preferred->version = property_exists( $preferred, 'version' ) ? $preferred->version : '0'; + return $preferred; } From bd046f91790b996e835744ebaede9b7f4970eacf Mon Sep 17 00:00:00 2001 From: Andy Fragen Date: Fri, 18 Oct 2024 13:32:11 -0700 Subject: [PATCH 3/4] update changes --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index cf2b628..c34f62c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,5 @@ [unreleased] -* fix if `get_preferred_from_update_core()` continues to return `false` +* fix if `get_preferred_from_update_core()` continues to return less than a complete response #### 3.6.0 / 2024-10-09 * remove Report a Bug in favor of using the standalone Test Reports plugin From 869e4f607645efbfa37dd32b9f830a152b53fd5c Mon Sep 17 00:00:00 2001 From: Andy Fragen Date: Wed, 23 Oct 2024 13:44:23 -0700 Subject: [PATCH 4/4] release --- CHANGES.md | 2 ++ readme.txt | 3 +++ wp-beta-tester.php | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index c34f62c..cc07081 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,4 +1,6 @@ [unreleased] + +#### 3.6.1 / 2024-10-23 * fix if `get_preferred_from_update_core()` continues to return less than a complete response #### 3.6.0 / 2024-10-09 diff --git a/readme.txt b/readme.txt index d6dc2f3..9c0136b 100644 --- a/readme.txt +++ b/readme.txt @@ -32,6 +32,9 @@ PRs are welcome on [GitHub](https://github.com/afragen/wordpress-beta-tester). ## Changelog +#### 3.6.1 / 2024-10-23 +* fix if `get_preferred_from_update_core()` continues to return less than a complete response + #### 3.6.0 / 2024-10-09 * remove Report a Bug in favor of using the standalone Test Reports plugin diff --git a/wp-beta-tester.php b/wp-beta-tester.php index 33cb66b..a238488 100644 --- a/wp-beta-tester.php +++ b/wp-beta-tester.php @@ -13,7 +13,7 @@ * Plugin URI: https://wordpress.org/plugins/wordpress-beta-tester/ * Description: Allows you to easily upgrade to Beta releases. * Author: WordPress Upgrade/Install Team - * Version: 3.6.0.1 + * Version: 3.6.1 * Network: true * Author URI: https://make.wordpress.org/core/components/upgrade-install/ * Text Domain: wordpress-beta-tester