Issue 5467: Fix worker and daemon

diff --git a/bin/daemon.php b/bin/daemon.php
index bf82912ee2abc91df456aa104409284fb2df4359..159b20e159503f3373b9836157c9b74513f0e34f 100755 (executable)
--- a/bin/daemon.php
+++ b/bin/daemon.php
@@ -13,9 +13,8 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 
 // Get options
-$shortopts  = '';
-$shortopts .= 'f';
-$longopts = [ 'foreground' ];
+$shortopts = 'f';
+$longopts = ['foreground'];
 $options = getopt($shortopts, $longopts);
 
 // Ensure that daemon.php is executed from the base path of the installation

diff --git a/src/App.php b/src/App.php
index c56d9c10e4240e35d5911dfa342b534e01388127..02215d2e69fcc10cf224301acbac836ff3326762 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -1127,7 +1127,7 @@ class App
                        return;
                }
 
-               $cmdline = $this->getConfigValue('config', 'php_path', 'php') . ' ' . $command;
+               $cmdline = $this->getConfigValue('config', 'php_path', 'php') . ' ' . escapeshellarg($command);
 
                foreach ($args as $key => $value) {
                        if (!is_null($value) && is_bool($value) && !$value) {
@@ -1140,8 +1140,6 @@ class App
                        }
                }
 
-               $cmdline = escapeshellarg($cmdline);
-
                if ($this->min_memory_reached()) {
                        return;
                }