From d7d33888cc0feca36577e55c207d426f991fedba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Sch=C3=BCle?= <p.schuele@metaways.de>
Date: Thu, 27 Feb 2025 10:35:52 +0100
Subject: [PATCH 1/2] tweak(Tinebase/Export): ignore acl when fetching user
 contact for twig

---
 tine20/Tinebase/Export/Abstract.php | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/tine20/Tinebase/Export/Abstract.php b/tine20/Tinebase/Export/Abstract.php
index fed4eed4b80..92a3f0eb547 100644
--- a/tine20/Tinebase/Export/Abstract.php
+++ b/tine20/Tinebase/Export/Abstract.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Tinebase Abstract export class
  *
@@ -6,7 +7,7 @@
  * @subpackage  Export
  * @license     http://www.gnu.org/licenses/agpl.html AGPL Version 3
  * @author      Paul Mehrer <p.mehrer@metaways.de>
- * @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,
             ];

From 0b7f3e1c720b913484f21e352ec4f7b377855c1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Sch=C3=BCle?= <p.schuele@metaways.de>
Date: Thu, 27 Feb 2025 10:45:04 +0100
Subject: [PATCH 2/2] feature(php): php 8.3 is now fully supported

@releasenotes
---
 README.md              | 2 +-
 tine20/RELEASENOTES.md | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 7f8564227e7..f025958e340 100644
--- a/README.md
+++ b/README.md
@@ -99,7 +99,7 @@ and follow the instructions of the repo.
 - DAVx5 to version 4.4.3
 
 ### Server
-- PHP version 8.1 to 8.2
+- PHP version 8.1 to 8.3
 - MySQL to version 8.0
 - MariaDB to version 10.9
 - Nginx to version 1.25
diff --git a/tine20/RELEASENOTES.md b/tine20/RELEASENOTES.md
index 07bdff558fe..22816252bce 100644
--- a/tine20/RELEASENOTES.md
+++ b/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