FGFS-4.1/phpvms
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for update showing available when one isn't #707

Browse Source
This commit is contained in:
Nabeel Shahzad
2020-05-21 11:06:27 -04:00
parent 52379c3789
commit 975ee9b88e
4 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Services/VersionService.php
View File

@@ -93,15 +93,18 @@ class VersionService extends Service
}
$include_prerelease = setting('general.check_prerelease_version', false);
Log::info('Include prerelease='.$include_prerelease);
foreach ($releases as $release) {
if ($release['prerelease'] === true) {
if ($include_prerelease) {
Log::info('Found latest pre-release of '.$release['tag_name']);
return $this->setLatestRelease(
$release['tag_name'],
$this->getGithubAsset($release)
);
}
continue;
}
@@ -206,15 +209,18 @@ class VersionService extends Service
$current_version = $this->cleanVersionString($current_version);
}
// Replace "dev" with "alpha", since
$latest_version = $this->getLatestVersion();
Log::info('Current version='.$current_version.'; latest detected='.$latest_version);
// No new/released version found
if (empty($latest_version)) {
$this->kvpRepo->save('new_version_available', false);
return false;
}
// Convert to semver
if ($this->isGreaterThan($latest_version, $current_version)) {
Log::info('Latest version "'.$latest_version.'" is greater than "'.$current_version.'"');
$this->kvpRepo->save('new_version_available', true);
return true;
}