Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Haakon Meland Eriksen 2016-01-24 10:35:20 +01:00
commit 089509ab87
4 changed files with 11 additions and 4 deletions

View File

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

View File

@ -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.

View File

@ -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,

View File

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