diff options
| author | Sebastian Egbers <sebastian@egbers.info> | 2012-06-25 13:59:39 +0200 |
|---|---|---|
| committer | Sebastian Egbers <sebastian@egbers.info> | 2012-06-25 13:59:39 +0200 |
| commit | 020deedd7c68ce016b65056062d85567c91c3d37 (patch) | |
| tree | b07a71b2d57d5dfae527ab9e2a6f42423bc8b327 /boot.php | |
| parent | cbf1cab0da2b67c8a88f301ce9ce6b83db27ec0b (diff) | |
| parent | 7ea5917bf794c431fe304fa25380f19a6927cf63 (diff) | |
| download | volse-hubzilla-020deedd7c68ce016b65056062d85567c91c3d37.tar.gz volse-hubzilla-020deedd7c68ce016b65056062d85567c91c3d37.tar.bz2 volse-hubzilla-020deedd7c68ce016b65056062d85567c91c3d37.zip | |
Merge branch 'master' of https://github.com/friendica/friendica
Diffstat (limited to 'boot.php')
| -rw-r--r-- | boot.php | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -10,9 +10,9 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.0.1382' ); +define ( 'FRIENDICA_VERSION', '3.0.1384' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); -define ( 'DB_UPDATE_VERSION', 1149 ); +define ( 'DB_UPDATE_VERSION', 1150 ); define ( 'EOL', "<br />\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); @@ -1374,9 +1374,9 @@ if(! function_exists('proc_run')) { if(count($args) && $args[0] === 'php') $args[0] = ((x($a->config,'php_path')) && (strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php'); - foreach ($args as $arg){ - $arg = escapeshellarg($arg); - } + for($x = 0; $x < count($args); $x ++) + $args[$x] = escapeshellarg($args[$x]); + $cmdline = implode($args," "); proc_close(proc_open($cmdline." &",array(),$foo)); } |