Restore config backup when extracting core files fails

Signed-off-by: Sam Poyigi <[email protected]>
tastyigniter · Dec 31, 2023 · 1ddc4ac · 1ddc4ac
1 parent 638836e
commit 1ddc4ac
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/app/system/classes/UpdateManager.php b/app/system/classes/UpdateManager.php
@@ -390,8 +390,7 @@ public function requestUpdateList($force = false)
                 $update['installedVer'] = params('ti_version');
                 if ($this->disableCoreUpdates)
                     continue;
-            }
-            else {
+            } else {
                 if ($this->isMarkedAsIgnored($update['code'])) {
                     $ignoredItems[] = $update;
                     continue;
@@ -516,10 +515,12 @@ public function extractCore($fileCode)
         $configBackup = base_path('/config-backup');
         File::moveDirectory($configDir, $configBackup);
 
-        $result = $this->extractFile($fileCode);
-
-        File::copyDirectory($configBackup, $configDir);
-        File::deleteDirectory($configBackup);
+        try {
+            $result = $this->extractFile($fileCode);
+        } finally {
+            File::copyDirectory($configBackup, $configDir);
+            File::deleteDirectory($configBackup);
+        }
 
         return $result;
     }