Upgrade to TYPO3 12.4.x

docmcfly · May 21, 2024 · 4a32a70 · 4a32a70
1 parent ad401e6
commit 4a32a70
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/Classes/Controller/MessageFormController.php b/Classes/Controller/MessageFormController.php
@@ -289,7 +289,7 @@ public function sendAction(Message $message)
                     $minimalMessage->setMessage('-');
                     $minimalMessage->setReceivers($message->getReceivers());
                     $this->messageRepository->add($minimalMessage);
-                    debug($minimalMessage, 'minimalMessage');
+                  //  debug($minimalMessage, 'minimalMessage');
                     break;
                 case 'full':
                     $message->setPid(GeneralUtility::intExplode(',', $this->settings[MessageFormController::MESSAGES_STORAGE_UID])[0]);
@@ -415,7 +415,7 @@ private function validate(Message $message, array $wrongReceivers = [], array $w
                 implode(', ', $wrongReceivers)
             ]);
         }
-        debug($message);
+      //  debug($message);
 
         $attachmentSize = 0;
         foreach ($message->getAttachments() as $attachment) {

diff --git a/Classes/Domain/Repository/FrontendUserRepository.php b/Classes/Domain/Repository/FrontendUserRepository.php
@@ -60,16 +60,15 @@ public function findByUserGroups(array $frontendUserGroupUid)
         $qb = $this->getQueryBuilder('fe_users');
         $qb->select('uid')->from('fe_users');
 
-        $usergroupTerm = array();
         /** @var int $uid */
         foreach ($frontendUserGroupUid as $uid) {
             $qb->orWhere($qb->expr()
                 ->inSet('usergroup', $uid));
         }
 
-        $s = $qb->execute();
+        $s = $qb->executeQuery();
         $return = array();
-        while ($row = $s->fetch()) {
+        while ($row = $s->fetchAssociative()) {
             $return[] = $row['uid'];
         }
         return $return;

diff --git a/ext_localconf.php b/ext_localconf.php
@@ -16,7 +16,7 @@
  *
  */
 
- defined('TYPO3') || die('Access denied.');
+defined('TYPO3') || die('Access denied.');
 
 call_user_func(function () {
 
@@ -61,6 +61,6 @@
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install']['update']['cynewsletter_sendMessagesMigrationWizard'] = SendMessagesMigrationWizard::class;
 
 
-$GLOBALS['TYPO3_CONF_VARS']['MAIL']['templateRootPaths']['cy_send_mails']    = 'EXT:cy_send_mails/Resources/Private/Templates/MessageMail/';
-$GLOBALS['TYPO3_CONF_VARS']['MAIL']['layoutRootPaths']['cy_send_mails']    = 'EXT:cy_send_mails/Resources/Private/Layouts/MessageMail/';
-$GLOBALS['TYPO3_CONF_VARS']['MAIL']['partialRootPaths']['cy_send_mails']    = 'EXT:cy_send_mails/Resources/Private/Partials/MessageMail/';
+$GLOBALS['TYPO3_CONF_VARS']['MAIL']['templateRootPaths']['cy_send_mails'] = 'EXT:cy_send_mails/Resources/Private/Templates/MessageMail/';
+$GLOBALS['TYPO3_CONF_VARS']['MAIL']['layoutRootPaths']['cy_send_mails'] = 'EXT:cy_send_mails/Resources/Private/Layouts/MessageMail/';
+$GLOBALS['TYPO3_CONF_VARS']['MAIL']['partialRootPaths']['cy_send_mails'] = 'EXT:cy_send_mails/Resources/Private/Partials/MessageMail/';