Merge branch 'pull'

[friendica.git] / mod / dfrn_notify.php

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 90d2e40045846457a837514c5244e5e1784e5859..f284b8b38955cf3ee284d9b4a43d7af85acb4f4e 100644 (file)
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -704,6 +704,7 @@ function dfrn_notify_post(&$a) {
                                        $ev['uid'] = $importer['uid'];
                                        $ev['uri'] = $item_id;
                                        $ev['edited'] = $datarray['edited'];
+                                       $ev['private'] = $datarray['private'];
 
                                        $r = q("SELECT * FROM `event` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
                                                dbesc($item_id),
@@ -747,6 +748,12 @@ function dfrn_notify_post(&$a) {
                                continue;
                        }
 
+                       // This is my contact on another system, but it's really me.
+                       // Turn this into a wall post.
+
+                       if($contact['remote_self'])
+                               $datarray['wall'] = 1;
+
                        $datarray['parent-uri'] = $item_id;
                        $datarray['uid'] = $importer['importer_uid'];
                        $datarray['contact-id'] = $importer['id'];