harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

provide option to use exec in proc_run

Browse Source
This commit is contained in:
redmatrix 2016-01-23 16:25:38 -08:00
parent 945689d01c
commit 7b73a689e1
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
boot.php
View File

@ -1723,9 +1723,13 @@ function proc_run($cmd){
$cmd = "cmd /c start \"title\" /D \"$cwd\" /b $cmdline"; $cmd = "cmd /c start \"title\" /D \"$cwd\" /b $cmdline";
proc_close(proc_open($cmd, array(), $foo)); proc_close(proc_open($cmd, array(), $foo));
} }
else {
if(get_config('system','proc_run_use_exec'))
exec($cmdline . ' > /dev/null &');
else else
proc_close(proc_open($cmdline ." &", array(), $foo)); proc_close(proc_open($cmdline ." &", array(), $foo));
} }
}
/** /**
* @brief Checks if we are running on M$ Windows. * @brief Checks if we are running on M$ Windows.

2
mod/channel.php
View File

@ -163,6 +163,7 @@ function channel_content(&$a, $update = 0, $load = false) {
$simple_update = ''; $simple_update = '';
if(($update) && (! $load)) { if(($update) && (! $load)) {
if ($mid) { if ($mid) {
$r = q("SELECT parent AS item_id from item where mid like '%s' and uid = %d $item_normal $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", 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(); $items = array();
} }
if((! $update) && (! $load)) { if((! $update) && (! $load)) {
// This is ugly, but we can't pass the profile_uid through the session to the ajax updater, // This is ugly, but we can't pass the profile_uid through the session to the ajax updater,

2
version.inc
View File

@ -1 +1 @@
2016-01-22.1286H 2016-01-23.1287H