provide option to use exec in proc_run
This commit is contained in:
parent
945689d01c
commit
7b73a689e1
8
boot.php
8
boot.php
@ -1723,8 +1723,12 @@ function proc_run($cmd){
|
||||
$cmd = "cmd /c start \"title\" /D \"$cwd\" /b $cmdline";
|
||||
proc_close(proc_open($cmd, array(), $foo));
|
||||
}
|
||||
else
|
||||
proc_close(proc_open($cmdline ." &", array(), $foo));
|
||||
else {
|
||||
if(get_config('system','proc_run_use_exec'))
|
||||
exec($cmdline . ' > /dev/null &');
|
||||
else
|
||||
proc_close(proc_open($cmdline ." &", array(), $foo));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -163,6 +163,7 @@ function channel_content(&$a, $update = 0, $load = false) {
|
||||
$simple_update = '';
|
||||
|
||||
if(($update) && (! $load)) {
|
||||
|
||||
if ($mid) {
|
||||
$r = q("SELECT parent AS item_id from item where mid like '%s' and uid = %d $item_normal
|
||||
AND item_wall = 1 AND item_unseen = 1 $sql_extra limit 1",
|
||||
@ -258,7 +259,6 @@ function channel_content(&$a, $update = 0, $load = false) {
|
||||
$items = array();
|
||||
}
|
||||
|
||||
|
||||
if((! $update) && (! $load)) {
|
||||
|
||||
// This is ugly, but we can't pass the profile_uid through the session to the ajax updater,
|
||||
|
@ -1 +1 @@
|
||||
2016-01-22.1286H
|
||||
2016-01-23.1287H
|
||||
|
Reference in New Issue
Block a user