Request Restart after UpgradeDb

PrestaShop · May 3, 2019 · 81ae146 · 81ae146
1 parent 195fc0b
commit 81ae146
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/classes/TaskRunner/Upgrade/AllUpgradeTasks.php b/classes/TaskRunner/Upgrade/AllUpgradeTasks.php
@@ -37,6 +37,7 @@
 class AllUpgradeTasks extends ChainedTasks
 {
     const initialTask = 'upgradeNow';
+    const TASKS_WITH_RESTART = ['upgradeFiles', 'upgradeDb'];
 
     protected $step = self::initialTask;
 
@@ -83,7 +84,7 @@ protected function checkIfRestartRequested(AjaxResponse $response)
             return false;
         }
 
-        if (!in_array($this->step, array('upgradeFiles'))) {
+        if (!in_array($this->step, self::TASKS_WITH_RESTART)) {
             return false;
         }
 

diff --git a/classes/UpgradeTools/CoreUpgrader/CoreUpgrader17.php b/classes/UpgradeTools/CoreUpgrader/CoreUpgrader17.php
@@ -47,6 +47,7 @@ protected function initConstants()
         }*/
 
         // Container may be needed to run upgrade scripts
+        $this->cleanFolders();
         $this->container->getSymfonyAdapter()->initAppKernel();
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -47,6 +47,7 @@ protected function initConstants() @@
             }*/
             // Container may be needed to run upgrade scripts
+            $this->cleanFolders();
             $this->container->getSymfonyAdapter()->initAppKernel();
         }
@@ Expand Down @@