From c99e093f8a2980ca762982784d38fd5747691f9c Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sat, 4 Apr 2020 12:13:45 +0200
Subject: [PATCH] Fix so imap error message is displayed to the user on folder
 create/update (#7245)

---
 CHANGELOG                              |  1 +
 program/steps/settings/save_folder.inc | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 50229d4f8..ab8be4c1e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -18,6 +18,7 @@ CHANGELOG Roundcube Webmail
 - Markasjunk: Fix marking as spam/ham on moving messages with Move menu (#7189)
 - Markasjunk: Fix bug where moving to Junk was failing on messages selected with Select > All (#7206)
 - Fix bug where session was destoryed with window close (#7251)
+- Fix so imap error message is displayed to the user on folder create/update (#7245)
 
 RELEASE 1.4.3
 -------------
diff --git a/program/steps/settings/save_folder.inc b/program/steps/settings/save_folder.inc
index 1b48b1258..03882c4da 100644
--- a/program/steps/settings/save_folder.inc
+++ b/program/steps/settings/save_folder.inc
@@ -135,7 +135,12 @@ if (!$error && !strlen($old_imap)) {
     }
     else {
         // show error message
-        $OUTPUT->show_message($plugin['message'] ?: 'errorsaving', 'error', null, false);
+        if (!empty($plugin['message'])) {
+            $OUTPUT->show_message($plugin['message'], 'error', null, false);
+        }
+        else {
+            $RCMAIL->display_server_error('errorsaving');
+        }
     }
 }
 // update a mailbox
@@ -198,7 +203,12 @@ else if (!$error) {
     }
     else {
         // show error message
-        $OUTPUT->show_message($plugin['message'] ?: 'errorsaving', 'error', null, false);
+        if (!empty($plugin['message'])) {
+            $OUTPUT->show_message($plugin['message'], 'error', null, false);
+        }
+        else {
+            $RCMAIL->display_server_error('errorsaving');
+        }
     }
 }