hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-08 10:34:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add content negociation provider

Browse Source
This commit is contained in:
Nicolas Le Goff
2014-06-03 11:16:20 +02:00
parent e17493aa0b
commit 45e53518ed
5 changed files with 49 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/classes/API/V1/result.php
View File

@@ -44,9 +44,6 @@ class API_V1_result
/** @var mixed */
protected $response;
/** @var string */
protected $response_type;
/** Constant for response type json */
const FORMAT_JSON = 'json';
/** Constant for response type yaml */
@@ -153,7 +150,7 @@ class API_V1_result
$return_value = false;
switch ($this->request->getRequestFormat('json')) {
switch ($this->request->getRequestFormat(self::FORMAT_JSON)) {
case self::FORMAT_JSON:
case self::FORMAT_JSON_EXTENDED:
default:
@@ -296,11 +293,7 @@ class API_V1_result
*/
public function get_http_code()
{
if ($this->response_type == self::FORMAT_JSONP && $this->http_code !== 500) {
return 200;
} else {
return $this->http_code;
}
return $this->http_code;
}
/**