Just some more fixed notice

[friendica.git] / mod / dfrn_notify.php

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 10a0a792a7715ce31630d4e26801eca260396a13..e3569965720af8b5b400df5e236ab745841f041e 100644 (file)
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -9,6 +9,7 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\System;
+use Friendica\Database\dba;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Protocol\DFRN;
@@ -265,6 +266,8 @@ function dfrn_dispatch_private($user, $postdata)
        // Set the user id. This is important if this is a public contact
        $importer['importer_uid']  = $user['uid'];
 
+       $importer = array_merge($importer, $user);
+
        logger('Importing post from ' . $msg['author'] . ' to ' . $user['nickname'] . ' with the private envelope.', LOGGER_DEBUG);
 
        // Now we should be able to import it
@@ -333,7 +336,8 @@ function dfrn_notify_content(App $a) {
                );
 
                if (!DBM::is_result($r)) {
-                       $status = 1;
+                       logger('No user data found for ' . $a->argv[1] . ' - SQL: ' . $sql_extra);
+                       killme();
                }
 
                logger("Remote rino version: ".$rino_remote." for ".$r[0]["url"], LOGGER_DATA);