Small code simplification in raise_error()

5 years ago · fbb5a5bc4f
parent e3d3add48a
commit fbb5a5bc4f
1 changed files with 7 additions and 11 deletions
--- 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");
-        }
    }

    /**