Merge pull request #5580 from tobiasd/20180807-frionavaccesskeys2

[friendica.git] / mod / pubsubhubbub.php

diff --git a/mod/pubsubhubbub.php b/mod/pubsubhubbub.php
index 53b9c01c157e7ecebda7240d0a118993b95bd630..8f9478d8aa51d0a322e6299156cca5968b9751b3 100644 (file)
--- a/mod/pubsubhubbub.php
+++ b/mod/pubsubhubbub.php
@@ -3,8 +3,7 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\System;
-use Friendica\Database\dba;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\PushSubscriber;
 use Friendica\Util\Network;
 
@@ -64,8 +63,8 @@ function pubsubhubbub_init(App $a) {
 
                // fetch user from database given the nickname
                $condition = ['nickname' => $nick, 'account_expired' => false, 'account_removed' => false];
-               $owner = dba::selectFirst('user', ['uid', 'hidewall'], $condition);
-               if (!DBM::is_result($owner)) {
+               $owner = DBA::selectFirst('user', ['uid', 'hidewall'], $condition);
+               if (!DBA::isResult($owner)) {
                        logger('Local account not found: ' . $nick . ' - topic: ' . $hub_topic . ' - callback: ' . $hub_callback);
                        System::httpExit(404);
                }
@@ -79,8 +78,8 @@ function pubsubhubbub_init(App $a) {
                // get corresponding row from contact table
                $condition = ['uid' => $owner['uid'], 'blocked' => false,
                        'pending' => false, 'self' => true];
-               $contact = dba::selectFirst('contact', ['poll'], $condition);
-               if (!DBM::is_result($contact)) {
+               $contact = DBA::selectFirst('contact', ['poll'], $condition);
+               if (!DBA::isResult($contact)) {
                        logger('Self contact for user ' . $owner['uid'] . ' not found.');
                        System::httpExit(404);
                }