some fixes for new safe-upgrade

Signed-off-by: Andy Miller <rhuk@mac.com>
This commit is contained in:
Andy Miller
2025-11-14 14:42:39 +00:00
parent a65eeed4dc
commit dfc1875129
4 changed files with 20 additions and 16 deletions

View File

@@ -1204,12 +1204,8 @@ class SafeUpgradeManager
$report['psr_log_conflicts'] = $this->detectPsrLogConflictsLocal();
$report['monolog_conflicts'] = $this->detectMonologConflictsLocal();
if ($report['plugins_pending']) {
if ($report['is_major_minor_upgrade']) {
$report['blocking'][] = 'Plugin and theme updates must be applied before upgrading Grav.';
} else {
$report['warnings'][] = 'Pending plugin/theme updates detected; updating before upgrading Grav is recommended.';
}
if ($report['plugins_pending'] && $report['is_major_minor_upgrade']) {
$report['blocking'][] = 'Pending plugin/theme updates detected. Because this is a major Grav upgrade, update them before continuing.';
}
if ($report['psr_log_conflicts']) {