aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xboot.php8
-rw-r--r--mod/channel.php2
-rw-r--r--version.inc2
3 files changed, 8 insertions, 4 deletions
diff --git a/boot.php b/boot.php
index bb4bc977d..9d80eedb4 100755
--- a/boot.php
+++ b/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));
+ }
}
/**
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