Merge remote-tracking branch 'upstream/master'

[quix0rs-gnu-social.git] / plugins / DirectMessage / DirectMessagePlugin.php

diff --git a/plugins/DirectMessage/DirectMessagePlugin.php b/plugins/DirectMessage/DirectMessagePlugin.php
index 6be9fb508312caf4f8a5e37527013c042acc239b..34533ba9e82cf5406c960aeb484168ca60d91c2e 100644 (file)
--- a/plugins/DirectMessage/DirectMessagePlugin.php
+++ b/plugins/DirectMessage/DirectMessagePlugin.php
@@ -63,7 +63,9 @@ class DirectMessagePlugin extends Plugin
         if (!empty($uas->after)) {
             $messages = array_filter($messages, array($uas, 'createdAfter'));
         }
-        $objs[] = $messages;
+        foreach ($messages as $message) {
+            $objs[] = clone($message);
+        }
 
         // Messages _to_ the user
         $msgMap = Message::listGet('to_profile', array($uas->getUser()->id));
@@ -71,7 +73,9 @@ class DirectMessagePlugin extends Plugin
         if (!empty($uas->after)) {
             $messages = array_filter($messages, array($uas, 'createdAfter'));
         }
-        $objs[] = $messages;
+        foreach ($messages as $message) {
+            $objs[] = clone($message);
+        }
 
         return true;
     }
@@ -145,7 +149,7 @@ class DirectMessagePlugin extends Plugin
         return true;
     }
 
-    public function onProfileDeleteRelated(Profile $profile, &$related)
+    public function onProfileDeleteRelated(Profile $profile, array &$related)
     {
         $msg = new Message();
         $msg->from_profile = $profile->id;