diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-01-24 10:35:20 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-01-24 10:35:20 +0100 |
| commit | 089509ab876708ecebeec866e5957d979dd5bffa (patch) | |
| tree | 120563d9209d7696e457faeedce1384fc90c2adb | |
| parent | 0d119d83b0a98b2cdd31a01901bbe53374d4e467 (diff) | |
| parent | ae6ae881519446f1ce750e678b5871a5e3866d0e (diff) | |
| download | volse-hubzilla-089509ab876708ecebeec866e5957d979dd5bffa.tar.gz volse-hubzilla-089509ab876708ecebeec866e5957d979dd5bffa.tar.bz2 volse-hubzilla-089509ab876708ecebeec866e5957d979dd5bffa.zip | |
Merge remote-tracking branch 'upstream/master'
| -rwxr-xr-x | boot.php | 8 | ||||
| -rw-r--r-- | doc/hidden_configs.bb | 3 | ||||
| -rw-r--r-- | mod/channel.php | 2 | ||||
| -rw-r--r-- | version.inc | 2 |
4 files changed, 11 insertions, 4 deletions
@@ -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)); + } } /** diff --git a/doc/hidden_configs.bb b/doc/hidden_configs.bb index c07d6ca01..5cb482cd9 100644 --- a/doc/hidden_configs.bb +++ b/doc/hidden_configs.bb @@ -90,6 +90,9 @@ This document assumes you're an administrator. Similar to block_public, except only blocks public access to search features. Useful for sites that want to be public, but keep getting hammered by search engines. + [b]system.proc_run_use_exec + If 1, use the exec system call in proc_run to run background tasks. By default + we use proc_open and proc_close. On some (currently rare) systems this does not work well. [b]system.paranoia[/b] As the pconfig, but on a site-wide basis. Can be overwritten by member settings. diff --git a/mod/channel.php b/mod/channel.php index 074017466..3b80e2cb8 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -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, diff --git a/version.inc b/version.inc index e558e2de2..d884e64a2 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2016-01-22.1286H +2016-01-23.1287H |