mirror of
https://github.com/getgrav/grav-plugin-admin.git
synced 2026-03-05 12:01:32 +01:00
some fixes for new safe-upgrade
Signed-off-by: Andy Miller <rhuk@mac.com>
This commit is contained in:
@@ -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']) {
|
||||
|
||||
Reference in New Issue
Block a user