Fix install issues on php82

salesagility · Jul 19, 2023 · ab7788c · ab7788c
1 parent b90e3cd
commit ab7788c
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/install/performSetup.php b/install/performSetup.php
@@ -712,9 +712,11 @@ function installStatus($msg, $cmd = null, $overwrite = false, $before = '[ok]<br
 $_REQUEST['do_not_redirect'] = true;
 
 // restore superglobals and vars
-$GLOBALS = $varStack['GLOBALS'];
+foreach ($varStack['GLOBALS'] ?? [] as $index => $item) {
+    $GLOBALS[$index] = $item;
+}
 foreach ($varStack['defined_vars'] as $__key => $__value) {
-    ${$__key} = $__value;
+    $$__key = $__value;
 }
 
 
@@ -728,7 +730,7 @@ function installStatus($msg, $cmd = null, $overwrite = false, $before = '[ok]<br
 }
 
 
-if (count($bottle) > 0) {
+if (is_countable($bottle) && count($bottle) > 0) {
     foreach ($bottle as $bottle_message) {
         $bottleMsg .= "{$bottle_message}\n";
     }