add check if request exist

heimrichhannot · Jun 30, 2022 · c8975ad · c8975ad
1 parent cdf1198
commit c8975ad
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,8 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.23.4] - 2022-06-30
+- Fixed: issue on sending messages with notification center queue
+
 ## [1.23.3] - 2022-06-30
 - Fixed: empty host in optInUrl in some cases
+- Fixed: empty host in optInUrl in some cases
 - Fixed: warning in Tokens
 
 ## [1.23.2] - 2022-06-28

diff --git a/classes/EventListener/FormGeneratorListener.php b/classes/EventListener/FormGeneratorListener.php
@@ -121,7 +121,10 @@ public function onSendNotificationMessage(Message $message, array &$tokens, ?str
         }
 
         if (version_compare(VERSION, '4.7', '>=')) {
-            if (($tokens['formconfig_huhSubAddOptIn'] ?? false) && isset($tokens['formconfig_optInIdentifier'])) {
+            if (($tokens['formconfig_huhSubAddOptIn'] ?? false)
+                && isset($tokens['formconfig_optInIdentifier'])
+                && System::getContainer()->get('request_stack')->getCurrentRequest()
+            ) {
                 $base = System::getContainer()->get('request_stack')->getCurrentRequest()->getSchemeAndHttpHost();
                 $tokens['optInToken'] = $tokens['formconfig_optInIdentifier'];
                 $tokens['optInUrl'] = $base.'?token='.$tokens['formconfig_optInIdentifier'];