tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge branch 'rewrites/is_filled_array_introduced' of git://github.com/Quix0r/friendica into Quix0r-rewrites/is_filled_array_introduced

Browse source 
Conflicts:
	boot.php
This commit is contained in:
Michael Vogel 2016-07-02 13:38:23 +02:00
commit 7d531afd00
10 changed files with 73 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/poller.php
View file

@ -228,7 +228,7 @@ function poller_max_connections_reached() {
function poller_kill_stale_workers() {
$r = q("SELECT `pid`, `executed` FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'");
if (!is_array($r) || count($r) == 0) {
if (!dba::is_result($r)) {
// No processing here needed
return;
}