Merge remote-tracking branch 'upstream/2021.09-rc' into user-contact

2021-09-18 20:27:24 +00:00
parent 2926282f8d 24ecf5954c
commit 3dddea96fa
30 changed files with 414 additions and 301 deletions
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -2211,7 +2211,7 @@ class Diaspora
 				return true;
 			} else {
 				Logger::log("Author ".$author." doesn't want to follow us anymore.", Logger::DEBUG);
-				Contact::removeFollower($importer, $contact);
+				Contact::removeFollower($contact);
 				return true;
 			}
 		}