Merge branch 'twitter-import' into 0.8.x

1 files changed, 8 insertions, 2 deletions

diff --git a/classes/Foreign_link.php b/classes/Foreign_link.php
index afc0e2180..5d9c82a85 100644
--- a/classes/Foreign_link.php
+++ b/classes/Foreign_link.php
@@ -57,13 +57,19 @@ class Foreign_link extends Memcached_DataObject
         return null;
     }
 
-    function set_flags($noticesync, $replysync, $friendsync)
+    function set_flags($noticesend, $noticerecv, $replysync, $friendsync)
     {
-        if ($noticesync) {
+        if ($noticesend) {
             $this->noticesync |= FOREIGN_NOTICE_SEND;
         } else {
             $this->noticesync &= ~FOREIGN_NOTICE_SEND;
         }
+        
+        if ($noticerecv) {
+            $this->noticesync |= FOREIGN_NOTICE_RECV;
+        } else {
+            $this->noticesync &= ~FOREIGN_NOTICE_RECV;
+        }
 
         if ($replysync) {
             $this->noticesync |= FOREIGN_NOTICE_SEND_REPLY;