Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-07-07 12:51:28 +02:00
Code Issues Packages Projects Releases Activity

fall back to safe upgrade

Browse Source 
Signed-off-by: Andy Miller <rhuk@mac.com>
This commit is contained in:
Andy Miller
2025-11-08 19:54:20 +00:00
parent ba3e0686a6
commit 38494b2c1c
1 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
system/src/Grav/Installer/Install.php
View File

@@ -311,23 +311,18 @@ ERR;
$expectedReal = realpath($expectedPath) ?: $expectedPath;
if ($loadedFromReal !== $expectedReal) {
// OLD SafeUpgradeService is already loaded - we cannot proceed safely
throw new RuntimeException(
sprintf(
"CRITICAL: SafeUpgradeService was already loaded from the old installation.\n" .
"This prevents the new version from being used and will cause bugs to persist.\n\n" .
"Loaded from: %s\n" .
"Expected: %s\n\n" .
"WORKAROUND: This is a known issue in Grav < 1.7.50.9.\n" .
"The old CLI/Admin code loads SafeUpgradeService before downloading the package.\n" .
"Once you upgrade to 1.7.50.9+, this issue will be fixed.\n\n" .
"For now, you have two options:\n" .
"1. Use manual upgrade: Download zip, extract, copy files\n" .
"2. Wait for automatic fix in next release",
$loadedFromReal,
$expectedReal
)
);
// OLD SafeUpgradeService is already loaded - fall back to traditional upgrade
error_log(sprintf(
'WARNING: SafeUpgradeService was loaded from old installation (%s). ' .
'Falling back to traditional upgrade method.',
$loadedFromReal
));
// Force traditional upgrade by disabling safe upgrade
Install::forceSafeUpgrade(false);
// Skip to traditional upgrade below
goto traditional_upgrade;
}
}
@@ -415,6 +410,7 @@ ERR;
}
Installer::setError(Installer::OK);
} else {
traditional_upgrade:
Installer::install(
$this->zip ?? '',
GRAV_ROOT,