Merge pull request #9877 from annando/application-json

Accept "application/json" as application type for ActivityPub

diff --git a/src/Worker/ExpireAndRemoveUsers.php b/src/Worker/ExpireAndRemoveUsers.php
index f28f410b965e24af141810281ec9f879f622fe99..8caaf131ed997430925dae85eea191962ea9eb14 100644 (file)
--- a/src/Worker/ExpireAndRemoveUsers.php
+++ b/src/Worker/ExpireAndRemoveUsers.php
@@ -57,8 +57,17 @@ class ExpireAndRemoveUsers
                                DBA::delete('contact', ['nurl' => $self['nurl'], 'self' => false]);
                        }
 
+                       // We have to delete photo entries by hand because otherwise the photo data won't be deleted
                        Photo::delete(['uid' => $user['uid']]);
 
+                       // These tables contain the permissionset which will also be deleted when a user is deleted.
+                       // It seems that sometimes the system wants to delete the records in the wrong order.
+                       // So when the permissionset is deleted and these tables are still filled then an error is thrown.
+                       // So we now delete them before all other user related entries are deleted.
+                       DBA::delete('item', ['uid' => $user['uid']]);
+                       DBA::delete('post-user', ['uid' => $user['uid']]);
+                       DBA::delete('profile_field', ['uid' => $user['uid']]);
+
                        DBA::delete('user', ['uid' => $user['uid']]);
                }
                DBA::close($users);

diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php
index 7a674c87d0d8c6b41e62a42eb0a84c3f588f8077..eea5b19560d8df2a02009724a61691dd061cd8ea 100644 (file)
--- a/src/Worker/OnePoll.php
+++ b/src/Worker/OnePoll.php
@@ -245,7 +245,7 @@ class OnePoll
                                        $datarray['network'] = Protocol::MAIL;
                                        // $meta = Email::messageMeta($mbox, $msg_uid);
 
-                                       $datarray['uri'] = Email::msgid2iri(trim($meta->message_id, '<>'));
+                                       $datarray['thr-parent'] = $datarray['uri'] = Email::msgid2iri(trim($meta->message_id, '<>'));
 
                                        // Have we seen it before?
                                        $fields = ['deleted', 'id'];