mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-05-24 07:09:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: patch version override logic incorrect

Browse Source
This commit is contained in:
Zack Spear
2025-03-27 14:37:49 -07:00
parent 0e7c4ee3ba
commit 14e0fed12a
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
emhttp/plugins/dynamix.my.servers/include/state.php
+10 -3
View File
@@ -96,10 +96,17 @@ class ServerState
$this->var = $webguiGlobals['var'];
// If we're on a patch, we need to use the combinedVersion to check for updates
$patcherVersion = null;
if (file_exists('/tmp/Patcher/patches.json')) {
$patchJson = @json_decode(@file_get_contents('/tmp/Patcher/patches.json'), true) ?: [];
$this->var['version'] = $patchJson['combinedVersion'] ?? $this->var['version'];
$patcherData = @json_decode(file_get_contents('/tmp/Patcher/patches.json'), true);
$unraidVersionInfo = parse_ini_file('/etc/unraid-version');
if ($patcherData['unraidVersion'] === $unraidVersionInfo['version']) {
$patcherVersion = $patcherData['combinedVersion'] ?? null;
}
}
// If we're on a patch, we need to use the combinedVersion to check for updates
if ($patcherVersion) {
$this->var['version'] = $patcherVersion;
}
$this->nginxCfg = @parse_ini_file('/var/local/emhttp/nginx.ini') ?? [];
emhttp/plugins/dynamix.plugin.manager/include/UnraidCheck.php
+4 -1
View File
@@ -119,7 +119,10 @@ class UnraidOsCheck
$patcherVersion = null;
if (file_exists('/tmp/Patcher/patches.json')) {
$patcherData = @json_decode(file_get_contents('/tmp/Patcher/patches.json'), true);
$patcherVersion = $patcherData['combinedVersion'] ?? null;
$unraidVersionInfo = parse_ini_file('/etc/unraid-version');
if ($patcherData['unraidVersion'] === $unraidVersionInfo['version']) {
$patcherVersion = $patcherData['combinedVersion'] ?? null;
}
}
$params['current_version'] = $patcherVersion ?: plugin('version', self::PLG_PATH) ?: _var($var, 'version');