Stay on current page after checking messages/requests.

BeWelcome · Sep 16, 2024 · 4fbb425 · 4fbb425
1 parent 103c47a
commit 4fbb425
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/Controller/Admin/CheckerController.php b/src/Controller/Admin/CheckerController.php
@@ -253,6 +253,10 @@ private function handleMessages(Request $request, int $type): Response
                 $this->checkerModel->unmarkAsSpamByChecker($noSpamMessageIds);
                 $this->addFlash('notice', 'Set spam status');
 
+                if ($type === self::MESSAGES_BLOCK_WORDS_PROCESSED) {
+                    return $this->redirectToRoute('admin_spam_messages_block_words');
+                }
+
                 return $this->redirectToRoute('admin_spam_messages');
             }
         }

diff --git a/src/Model/ConversationModel.php b/src/Model/ConversationModel.php
@@ -265,15 +265,15 @@ public function getLastMessageInConversation(Message $probableParent): Message
     {
         // Check if there is already a newer message than the one used for the request
         // as there might be a clash of replies
-        /** @var MessageRepository */
+        /** @var MessageRepository $messageRepository */
         $messageRepository = $this->entityManager->getRepository(Message::class);
         /** @var Message[] $messages */
         $messages = $messageRepository->findBy(['subject' => $probableParent->getSubject()]);
 
         return $messages[\count($messages) - 1];
     }
 
-    public function markConversationAsRead(Member $member, array $thread)
+    public function markConversationAsRead(Member $member, array $thread): void
     {
         // Walk through the thread and mark all messages as read (for current member)
         $em = $this->entityManager;