aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorolivierm <olivier@migeot.org>2011-02-23 20:25:37 +0100
committerolivierm <olivier@migeot.org>2011-02-23 20:25:37 +0100
commit75a8b684fcb198f03a4dc2f208395179144f5fe7 (patch)
tree4b4936b3a5280c87d740451f3ee54407834cf7de /boot.php
parent3ad7c395fb9a33319531e04673563e7c9983d8f0 (diff)
parentb6ba303f4b7649454bbee9a4f798f74b1f49c871 (diff)
downloadvolse-hubzilla-75a8b684fcb198f03a4dc2f208395179144f5fe7.tar.gz
volse-hubzilla-75a8b684fcb198f03a4dc2f208395179144f5fe7.tar.bz2
volse-hubzilla-75a8b684fcb198f03a4dc2f208395179144f5fe7.zip
Merge commit 'mike/master'
Diffstat (limited to 'boot.php')
-rw-r--r--boot.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/boot.php b/boot.php
index d4398a11a..530baa7b9 100644
--- a/boot.php
+++ b/boot.php
@@ -2430,13 +2430,13 @@ function prepare_body($item) {
* $cmd and string args are surrounded with ""
*/
-if(! function_exists('run_proc')) {
+if(! function_exists('proc_run')) {
function proc_run($cmd){
$args = func_get_args();
call_hooks("proc_run", $args);
- foreach ($args as &$arg){
- if(is_string($arg)) $arg='"'.$arg.'"';
+ foreach ($args as $arg){
+ $arg = escapeshellarg($arg);
}
$cmdline = implode($args," ");
proc_close(proc_open($cmdline." &",array(),$foo));