Merge remote-tracking branch 'upstream/develop' into user-contact

2021-10-02 11:57:43 +00:00
parent a2532ad755 de2352e34d
commit 865006682a
54 changed files with 4237 additions and 4188 deletions
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -951,7 +951,7 @@ class Contact extends BaseModule
 		if (!$update) {
 			// We need the editor here to be able to reshare an item.
 			if (local_user()) {
-				$o = status_editor($a, [], 0, true);
+				$o = DI::conversation()->statusEditor([], 0, true);
 			}
 		}