- fix errors handling in ajax requests (#1485872)

16 years ago · ac4882f35d
parent eaf947cef6
commit ac4882f35d
1 changed files with 6 additions and 3 deletions
--- a/program/steps/error.inc
+++ b/program/steps/error.inc
@ -85,8 +85,13 @@ else {
 }


-// compose page content
+// Ajax request
+if ($OUTPUT && ($OUTPUT instanceof rcube_json_output)) {
+  header("HTTP/1.0 $ERROR_CODE $__error_title");
+  die;
+}

+// compose page content
 $__page_content = <<<EOF
 <div>
 <h3 class="error-title">$__error_title</h3>
@ -94,8 +99,6 @@ $__page_content = <<<EOF
 </div>
 EOF;

-
-
 if ($OUTPUT && $OUTPUT->template_exists('error')) {
  $OUTPUT->reset();
  $OUTPUT->send('error');