1
0
Fork 0

Merge branch 'develop' into 1706-lock

This commit is contained in:
Michael Vogel 2017-06-06 14:16:00 +02:00 committed by GitHub
commit f4652d6e50
31 changed files with 19040 additions and 7890 deletions

View file

@ -30,10 +30,11 @@ function handle_pubsubhubbub($id) {
global $a;
$r = q("SELECT * FROM `push_subscriber` WHERE `id` = %d", intval($id));
if (!$r)
if (!dbm::is_result($r)) {
return;
else
$rr = $r[0];
}
$rr = $r[0];
/// @todo Check server status with poco_check_server()
// Before this can be done we need a way to safely detect the server url.