From c0124b6245dbd17decb2b5fd3e07f1380921375d Mon Sep 17 00:00:00 2001 From: Lucas Bickel Date: Wed, 21 Nov 2018 02:21:52 +0100 Subject: [PATCH 1/2] :bug: returnn array of strings The downstream version checking code expects an array of strings and the "github is unreachable" default was returning a string. --- airtime_mvc/application/models/Preference.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php index 4dee92700..3e64bde6b 100644 --- a/airtime_mvc/application/models/Preference.php +++ b/airtime_mvc/application/models/Preference.php @@ -912,7 +912,7 @@ class Application_Model_Preference self::setValue('latest_version', json_encode($latest)); self::setValue('latest_version_nextcheck', strtotime('+1 week')); if (empty($latest)) { - return $config['airtime_version']; + return array($config['airtime_version']); } else { return $latest; } From b65c04039442bc144015509c7fa280d01d0605b6 Mon Sep 17 00:00:00 2001 From: Lucas Bickel Date: Wed, 21 Nov 2018 02:25:27 +0100 Subject: [PATCH 2/2] :recycle: only store versions on success We should only overwrite latest_version if retreiving from GitHub went ok, else we should keep the old values and store "null". --- airtime_mvc/application/models/Preference.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php index 3e64bde6b..368d3e52a 100644 --- a/airtime_mvc/application/models/Preference.php +++ b/airtime_mvc/application/models/Preference.php @@ -909,13 +909,13 @@ class Application_Model_Preference $versions[] = $item->get_title(); } $latest = $versions; - self::setValue('latest_version', json_encode($latest)); self::setValue('latest_version_nextcheck', strtotime('+1 week')); if (empty($latest)) { return array($config['airtime_version']); - } else { - return $latest; } + + self::setValue('latest_version', json_encode($latest)); + return $latest; } public static function SetLatestVersion($version)