Fix unneeded php command use in installto.sh and deluser.sh scripts (#…

…9237)
roundcube · Dec 5, 2023 · 98ac6e0 · 98ac6e0
1 parent edf2a95
commit 98ac6e0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -33,6 +33,8 @@
 - Fix page jump menu flickering on click (#9196)
 - Update to TinyMCE 5.10.9 security release (#9228)
 - Fix PHP8 warnings (#9235, #9238)
+- Fix saving other encryption settings besides enigma's (#9240)
+- Fix unneeded php command use in installto.sh and deluser.sh scripts (#9237)
 
 ## Release 1.6.5
 

diff --git a/bin/deluser.sh b/bin/deluser.sh
@@ -57,7 +57,7 @@ if (!empty($args['age']) && ($age = intval($args['age']))) {
             printf("%s (%s)\n", $user['username'], $user['mail_host']);
             continue;
         }
-        system(sprintf("php %s/deluser.sh --host=%s %s", INSTALL_PATH . 'bin', escapeshellarg($user['mail_host']), escapeshellarg($user['username'])));
+        system(sprintf("%s/deluser.sh --host=%s %s", INSTALL_PATH . 'bin', escapeshellarg($user['mail_host']), escapeshellarg($user['username'])));
     }
     exit(0);
 }

diff --git a/bin/installto.sh b/bin/installto.sh
@@ -140,7 +140,7 @@ if (strtolower($input) == 'y') {
     }
 
     echo "Running update script at target...\n";
-    system("cd $target_dir && php bin/update.sh --version=$oldversion" . ($accept ? ' -y' : ''));
+    system("cd $target_dir && bin/update.sh --version=$oldversion" . ($accept ? ' -y' : ''));
     echo "All done.\n";
 }
 else {