aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-01-24 15:20:25 -0800
committerredmatrix <git@macgirvin.com>2016-01-24 15:20:25 -0800
commitbaed7d339ee0d5139fe1c93691a4225796e7e08c (patch)
treee30aaf4506b454a936236e130dee0177cafd5e80 /boot.php
parent6759a28579b755a41d4670e879de5f602aa411f5 (diff)
downloadvolse-hubzilla-baed7d339ee0d5139fe1c93691a4225796e7e08c.tar.gz
volse-hubzilla-baed7d339ee0d5139fe1c93691a4225796e7e08c.tar.bz2
volse-hubzilla-baed7d339ee0d5139fe1c93691a4225796e7e08c.zip
make exec the default for proc_run - use system.use_proc_open to use proc_open. Also prohibit delegated channels from manually invoking new_channel under the delegated account.
Diffstat (limited to 'boot.php')
-rwxr-xr-xboot.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/boot.php b/boot.php
index d6c02ecc0..b80b76a8a 100755
--- a/boot.php
+++ b/boot.php
@@ -1728,10 +1728,10 @@ function proc_run($cmd){
proc_close(proc_open($cmd, array(), $foo));
}
else {
- if(get_config('system','proc_run_use_exec'))
- exec($cmdline . ' > /dev/null &');
- else
+ if(get_config('system','use_proc_open'))
proc_close(proc_open($cmdline ." &", array(), $foo));
+ else
+ exec($cmdline . ' > /dev/null &');
}
}