diff options
author | ctrlaltca <> | 2012-07-16 17:30:35 +0000 |
---|---|---|
committer | ctrlaltca <> | 2012-07-16 17:30:35 +0000 |
commit | 178a57096360c77e87f6a20e2d282b99a28a4e9c (patch) | |
tree | 746da711f99c3634402f1053ca60cd0286908c40 | |
parent | 40ad9f8c7964355f56f73fa0c4c5db40750bc023 (diff) |
fix #416
-rw-r--r-- | HISTORY | 1 | ||||
-rw-r--r-- | framework/Web/Services/TJsonService.php | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -4,6 +4,7 @@ BUG: Issue #412 - open_basedir restriction (ctrlaltca) BUG: Issue #413 - TActiveDatePicker does not fire TCallbackClientSide's events (ctrlaltca) BUG: Issue #414 - ActiveDatagrid's pager does not fire TCallbackClientSide's events (ctrlaltca) BUG: Issue #415 - prado-cli throws an error if the application is making use of THttpSession (ctrlaltca) +BUG: Issue #416 - TJsonService reports the wrong content-type (ctrlaltca) EHN: Permit to change the default cipher in TSecurityManager::setEncryption(); changed the default cipher from 3DES to AES256 (ctrlaltca) EHN: Use php's hash_hmac() when available in TSecurityManager, and permit the use of all algorithms supported by php (ctrlaltca) diff --git a/framework/Web/Services/TJsonService.php b/framework/Web/Services/TJsonService.php index b3dd795f..dc49ff6f 100644 --- a/framework/Web/Services/TJsonService.php +++ b/framework/Web/Services/TJsonService.php @@ -154,7 +154,7 @@ class TJsonService extends TService if(($content=$service->getJsonContent())!==null) { $response = $this->getResponse(); - $response->setContentType('text/javascript'); + $response->setContentType('application/json'); $response->setCharset('UTF-8'); //send content $response->write(TJavaScript::jsonEncode($content)); |