Merge branch '2024.11'

tine-groupware · Feb 17, 2025 · 3a7c34f · 3a7c34f
2 parents 0303cc4 + e25f1f8
commit 3a7c34f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/tine20/Felamimail/Controller/Message/Send.php b/tine20/Felamimail/Controller/Message/Send.php
@@ -850,10 +850,15 @@ protected function _setMailRecipients(Zend_Mail $_mail, Felamimail_Model_Message
         return $nonPrivateRecipients;
     }
 
-    protected function _getErrorException($messageText)
+    protected function _getErrorException(string $messageText): Tinebase_Exception_SystemGeneric
     {
         $translation = Tinebase_Translation::getTranslation('Felamimail');
-        $message = sprintf($translation->_('Error: %s'), $messageText);
+        if (preg_match('/evp_decrypt/i', $messageText)) {
+            $message = $translation->_(
+                'Decryption Error: Maybe your shared credential cache key is longer than 24 chars?');
+        } else {
+            $message = sprintf($translation->_('Error: %s'), $messageText);
+        }
         $tesg = new Tinebase_Exception_SystemGeneric($message);
         $tesg->setTitle($translation->_('Could not send message'));
 

diff --git a/tine20/RELEASENOTES.md b/tine20/RELEASENOTES.md
@@ -3,7 +3,7 @@ TINE RELEASENOTES
 =====================
                     
   Release:     Pelle (2024.11)
-  Last change: 2024-10-22
+  Last change: 2024-11-06
 
 # GENERAL CHANGES (Administrative/Operative)
 
@@ -37,6 +37,10 @@ TINE RELEASENOTES
 ## number range configuration (for example for Sales product numbers)
 ## Send Password via SMS
 ## Show Mailaccount Sieve-Script
+## Tinebase feature "featureShowAccountEmail" has been removed
+
+It is now possible to configure the account "title" display via TWIG templates.
+See Tinebase_Config::ACCOUNT_TWIG configuration.
 
 # SSO