Merge remote-tracking branch 'upstream/2018.08-rc' into ap1

[friendica.git] / mod / receive.php

diff --git a/mod/receive.php b/mod/receive.php
index 352ba94986ed5cfbc0ac963bcd23d464d7d93f75..80be7d2a2957edb1fdc0b7820efe64ec60952301 100644 (file)
--- a/mod/receive.php
+++ b/mod/receive.php
@@ -7,8 +7,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\Protocol\Diaspora;
 
 /**
@@ -34,8 +33,8 @@ function receive_post(App $a)
                }
                $guid = $a->argv[2];
 
-               $importer = dba::selectFirst('user', [], ['guid' => $guid, 'account_expired' => false, 'account_removed' => false]);
-               if (!DBM::is_result($importer)) {
+               $importer = DBA::selectFirst('user', [], ['guid' => $guid, 'account_expired' => false, 'account_removed' => false]);
+               if (!DBA::isResult($importer)) {
                        System::httpExit(500);
                }
        }