From fbb5a5bc4fcbf49e3b66fd4976a014cc2b03b017 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 22 Apr 2019 09:46:38 +0200
Subject: [PATCH] Small code simplification in raise_error()

---
 program/lib/Roundcube/rcube.php | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/program/lib/Roundcube/rcube.php b/program/lib/Roundcube/rcube.php
index 5e7174e30..0b58cbc82 100644
--- a/program/lib/Roundcube/rcube.php
+++ b/program/lib/Roundcube/rcube.php
@@ -1352,21 +1352,17 @@ class rcube
             self::log_bug($arg);
         }
 
+        if ($cli) {
+            fwrite(STDERR, 'ERROR: ' . trim($arg['message']) . "\n");
+        }
+        else if (is_object(self::$instance->output)) {
+            self::$instance->output->raise_error($arg['code'], $arg['message']);
+        }
+
         // terminate script
         if ($terminate) {
-            // display error page
-            if (is_object(self::$instance->output)) {
-                self::$instance->output->raise_error($arg['code'], $arg['message']);
-            }
-            else if ($cli) {
-                fwrite(STDERR, 'ERROR: ' . trim($arg['message']) . "\n");
-            }
-
             exit(1);
         }
-        else if ($cli) {
-            fwrite(STDERR, 'ERROR: ' . trim($arg['message']) . "\n");
-        }
     }
 
     /**