From d30268aac91554c25a524ce2d5652272caa42a8e Mon Sep 17 00:00:00 2001 From: wyd621 Date: Wed, 4 Dec 2013 07:41:27 +0000 Subject: [PATCH] * adjust check extension when upgrade. --- module/upgrade/control.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/module/upgrade/control.php b/module/upgrade/control.php index 9985826f95..51d858b368 100644 --- a/module/upgrade/control.php +++ b/module/upgrade/control.php @@ -95,11 +95,12 @@ class upgrade extends control $incompatibleExts = $this->extension->checkIncompatible($versions); $extensionsName = array(); + $removeCommands = array(); foreach($incompatibleExts as $extension) { $this->extension->updateExtension($extension, array('status' => 'deactivated')); - $this->extension->removePackage($extension); - $extensionsName[] = $extensions[$extension]->name; + $removeCommands[$extension] = $this->extension->removePackage($extension); + $extensionsName[$extension] = $extensions[$extension]->name; } $data = ''; @@ -107,7 +108,12 @@ class upgrade extends control { $data .= "

{$this->lang->upgrade->forbiddenExt}

"; $data .= ''; }