Small code simplification in raise_error()

pull/6724/head
Aleksander Machniak 5 years ago
parent e3d3add48a
commit fbb5a5bc4f

@ -1352,21 +1352,17 @@ class rcube
self::log_bug($arg); 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 // terminate script
if ($terminate) { 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); exit(1);
} }
else if ($cli) {
fwrite(STDERR, 'ERROR: ' . trim($arg['message']) . "\n");
}
} }
/** /**

Loading…
Cancel
Save