Merge branch '2024.11'

README.md

@@ -99,8 +99,8 @@ and follow the instructions of the repo.
 - DAVx5 to version 4.4.3
 
 ### Server
-- PHP version 8.1 to 8.2
-- MySQL version 8.0
+- PHP version 8.1 to 8.3
+- MySQL to version 8.0
 - MariaDB 10.4 to version 10.9
 - Nginx to version 1.25
 - Redis to version 6.0

tine20/RELEASENOTES.md

@@ -3,10 +3,14 @@ TINE RELEASENOTES
 =====================
                     
   Release:     Pelle (2024.11)
-  Last change: 2024-11-06
+  Last change: 2025-02-27
 
 # GENERAL CHANGES (Administrative/Operative)
 
+## PHP 8.3 Support
+
+- PHP 8.3 is now fully supported (with version 2024.11.6)
+
 ## PHP 8.2 Support
 
 - PHP 8.2 is now fully supported

tine20/Tinebase/Export/Abstract.php

@@ -1,12 +1,13 @@
 <?php
+
 /**
  * Tinebase Abstract export class
  *
  * @package     Tinebase
  * @subpackage  Export
  * @license     http://www.gnu.org/licenses/agpl.html AGPL Version 3
  * @author      Paul Mehrer <[email protected]>
- * @copyright   Copyright (c) 2017-2024 Metaways Infosystems GmbH (http://www.metaways.de)
+ * @copyright   Copyright (c) 2017-2025 Metaways Infosystems GmbH (http://www.metaways.de)
  *
  */
 
@@ -1590,8 +1591,10 @@ protected function _renderTwigTemplate($_record = null)
             if (isset($twigResult[$key]) || array_key_exists($key, $twigResult)) {
                 $value = $this->_convertToString($twigResult[$key]);
             } else {
-                if (Tinebase_Core::isLogLevel(Zend_Log::WARN)) Tinebase_Core::getLogger()->warn(__METHOD__ . '::' . __LINE__ .
-                    ' twig mapping: ' . $key . ' ' . $twigKey . ' not found in twig result array');
+                if (Tinebase_Core::isLogLevel(Zend_Log::WARN)) {
+                    Tinebase_Core::getLogger()->warn(__METHOD__ . '::' . __LINE__ .
+                        ' twig mapping: ' . $key . ' ' . $twigKey . ' not found in twig result array');
+                }
                 $value = '';
             }
             $this->_setValue($twigKey, $value);
@@ -1605,6 +1608,11 @@ protected function _renderTwigTemplate($_record = null)
     protected function _getTwigContext(array $context)
     {
         if (null === $this->_baseContext) {
+            $account = Tinebase_Core::getUser();
+            $contact = Addressbook_Controller_Contact::getInstance()->getContactByUserId(
+                $account->getId(),
+                true);
+
             $this->_baseContext = [
                 Addressbook_Config::INSTALLATION_REPRESENTATIVE => Addressbook_Config::getInstallationRepresentative(),
                 'branding' => [
@@ -1616,8 +1624,8 @@ protected function _getTwigContext(array $context)
                 'export' => [
                     'config' => $this->_config->toArray(),
                     'timestamp' => $this->_exportTimeStamp,
-                    'account' => Tinebase_Core::getUser(),
-                    'contact' => Addressbook_Controller_Contact::getInstance()->getContactByUserId(Tinebase_Core::getUser()->getId()),
+                    'account' => $account,
+                    'contact' => $contact,
                 ],
                 'additionalRecords' => $this->_additionalRecords,
             ];