summaryrefslogtreecommitdiffstats
path: root/application/errors/error_general.php
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2015-02-15 11:11:49 +0100
committerFlorian Pritz <bluewind@xinu.at>2015-02-15 11:11:49 +0100
commit45c16c802720faf9de6c3028ba41753c5edba974 (patch)
treee20148091cf0f9b6ff11efe65a76cfe1d1bad24c /application/errors/error_general.php
parent9535ede862e01d834ebdd553184b1f6544b06d2c (diff)
parent01226a9afd760a920e9cb3377913ee296f0ab2ca (diff)
Merge branch 'api-rework' into working
Diffstat (limited to 'application/errors/error_general.php')
-rw-r--r--application/errors/error_general.php11
1 files changed, 0 insertions, 11 deletions
diff --git a/application/errors/error_general.php b/application/errors/error_general.php
index 844dfb74d..87d5b62f6 100644
--- a/application/errors/error_general.php
+++ b/application/errors/error_general.php
@@ -15,17 +15,6 @@ if (class_exists("CI_Controller") && !isset($GLOBALS["is_error_page"])) {
is_cli_client(true);
}
- if (static_storage("response_type") == "json") {
- $message = str_replace("</p>", "</p>\n", $message);
- $array = array(
- "status" => "error",
- "message" => strip_tags($message),
- );
- header('Content-type: application/json');
- echo json_encode($array);
- exit();
- }
-
if (is_cli_client()) {
$message = str_replace("</p>", "</p>\n", $message);
$message = strip_tags($message);