From 12a321bd7aaafb8b920c2ac92420e784f1e4789a Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 4 Dec 2023 20:55:28 +0100
Subject: [PATCH] Fix PHP8 warning (#9238)

---
 CHANGELOG.md                               | 2 +-
 program/actions/mail/attachment_upload.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f32b8d3019..feba49d163b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@
 - Enigma: Fix finding of a private key when decrypting a message using GnuPG v2.3
 - Fix page jump menu flickering on click (#9196)
 - Update to TinyMCE 5.10.9 security release (#9228)
-- Fix PHP8 warning (#9235)
+- Fix PHP8 warnings (#9235, #9238)
 
 ## Release 1.6.5
 
diff --git a/program/actions/mail/attachment_upload.php b/program/actions/mail/attachment_upload.php
index 3e844acbb7d..02d80b047ca 100644
--- a/program/actions/mail/attachment_upload.php
+++ b/program/actions/mail/attachment_upload.php
@@ -65,7 +65,7 @@ public function run($args = [])
 
                 if (
                     $host == $url['host']
-                    && $port == $url['port']
+                    && $port == ($url['port'] ?? null)
                     && $rcmail->get_user_name() == rawurldecode($url['user'])
                 ) {
                     $message = new rcube_message($params['_uid'], $params['_mbox']);