tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

MINOR Fixed JSONDataFormatter excaping (fixes #5309, thanks briley) (from r101811)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112040 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2010-10-13 01:10:53 +00:00
parent 6f3866936d
commit 7d765fc5c6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/JSONDataFormatter.php
View File

@ -115,7 +115,7 @@ class JSONDataFormatter extends DataFormatter {
if($item->canView()) $jsonParts[] = $this->convertDataObject($item, $fields); if($item->canView()) $jsonParts[] = $this->convertDataObject($item, $fields);
} }
$json = "{\n"; $json = "{\n";
$json .= '\"totalSize\": '; $json .= '"totalSize": ';
$json .= (is_numeric($this->totalSize)) ? $this->totalSize : 'null'; $json .= (is_numeric($this->totalSize)) ? $this->totalSize : 'null';
$json .= ",\n"; $json .= ",\n";
$json .= "\"items\": [\n" . implode(",\n", $jsonParts) . "\n]\n"; $json .= "\"items\": [\n" . implode(",\n", $jsonParts) . "\n]\n";