Merge branch 'develop'

afragen · Oct 23, 2024 · 222577d · 222577d
2 parents 55deda9 + 869e4f6
commit 222577d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,8 @@
 [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
 * remove Report a Bug in favor of using the standalone Test Reports plugin
 

diff --git 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/src/WPBT/WP_Beta_Tester.php b/src/WPBT/WP_Beta_Tester.php
@@ -227,6 +227,15 @@ public function get_preferred_from_update_core() {
 			$preferred = get_preferred_from_update_core();
 		}
 
+		// 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;
 	}
 

diff --git 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.1
  * Network:           true
  * Author URI:        https://make.wordpress.org/core/components/upgrade-install/
  * Text Domain:       wordpress-beta-tester