From 85ef71769654275ffcfb39c740302d455f86dbb9 Mon Sep 17 00:00:00 2001 From: Miles Lott Date: Tue, 15 Jan 2002 01:46:27 +0000 Subject: [PATCH] Additional fix for non-installed apps during upgrades --- setup/inc/class.setup_detection.inc.php | 8 +++----- setup/inc/class.setup_process.inc.php | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/setup/inc/class.setup_detection.inc.php b/setup/inc/class.setup_detection.inc.php index e41a6717d4..de274e5b45 100755 --- a/setup/inc/class.setup_detection.inc.php +++ b/setup/inc/class.setup_detection.inc.php @@ -172,16 +172,14 @@ /* Only set this if it has not already failed to upgrade - Milosch */ if ($setup_info[$key]['status'] != 'F' )//&& $setup_info[$key]['status'] != 'C') { - /* if($setup_info[$key]['status'] == 'C') { - $setup_info[$key]['status'] = 'P'; + $setup_info[$key]['status'] = 'D'; } else { - */ - $setup_info[$key]['status'] = 'D'; - //} + $setup_info[$key]['status'] = 'P'; + } } } } diff --git a/setup/inc/class.setup_process.inc.php b/setup/inc/class.setup_process.inc.php index a4dad9570e..377aa3aaa8 100755 --- a/setup/inc/class.setup_process.inc.php +++ b/setup/inc/class.setup_process.inc.php @@ -515,6 +515,7 @@ { echo '
process_upgrade(): Application not installed: ' . $appname . "\n"; } + @unset($setup_info[$key]); continue; }