Merge branch 'release/1.7.50.2'

This commit is contained in:
Andy Miller
2025-10-21 13:22:11 -06:00
3 changed files with 15 additions and 2 deletions

View File

@@ -1,3 +1,9 @@
# v1.7.50.2
## 10/21/2025
1. [](#bugfix)
* Fix for `SafeUpgradeService::getLastManifest()` fatal error on upgrade [#3966](https://github.com/getgrav/grav/issues/3966)
# v1.7.50.1
## 10/20/2025

View File

@@ -9,7 +9,7 @@
// Some standard defines
define('GRAV', true);
define('GRAV_VERSION', '1.7.50.1');
define('GRAV_VERSION', '1.7.50.2');
define('GRAV_SCHEMA', '1.7.0_2020-11-20_1');
define('GRAV_TESTING', false);

View File

@@ -300,7 +300,14 @@ ERR;
});
}
$manifest = $service->promote($this->location, $this->getVersion(), $this->ignores);
$this->lastManifest = $service->getLastManifest() ?? $manifest;
$this->lastManifest = $manifest;
if (method_exists($service, 'getLastManifest')) {
// SafeUpgradeService in Grav < 1.7.50.1 does not expose getLastManifest().
$lastManifest = $service->getLastManifest();
if (null !== $lastManifest) {
$this->lastManifest = $lastManifest;
}
}
Installer::setError(Installer::OK);
} else {
Installer::install(