1 files changed, 3 insertions, 2 deletions
diff --git a/program/include/rcube.php b/program/include/rcube.php
index 272136fa8..694f28820 100644
--- a/program/include/rcube.php
+++ b/program/include/rcube.php
@@ -1057,7 +1057,8 @@ class rcube
             return;
         }
 
-        if ($log && $arg['type'] && $arg['message']) {
+        if (($log || $terminate) && $arg['type'] && $arg['message']) {
+            $arg['fatal'] = $terminate;
             self::log_bug($arg);
         }
 
@@ -1085,7 +1086,7 @@ class rcube
         }
 
         // write error to local log file
-        if ($level & 1) {
+        if (($level & 1) || !empty($arg_arr['fatal'])) {
             if ($_SERVER['REQUEST_METHOD'] == 'POST') {
                 $post_query = '?_task='.urlencode($_POST['_task']).'&_action='.urlencode($_POST['_action']);
             }