Merged in changed from drupal git.
parent
ece7b5bcde
commit
4d319b3424
|
@ -784,12 +784,12 @@ class H5PValidator {
|
||||||
*/
|
*/
|
||||||
private function getJsonData($filePath, $return_as_string = FALSE) {
|
private function getJsonData($filePath, $return_as_string = FALSE) {
|
||||||
$json = file_get_contents($filePath);
|
$json = file_get_contents($filePath);
|
||||||
if (!$json) {
|
if ($json === FALSE) {
|
||||||
return FALSE;
|
return FALSE; // Cannot read from file.
|
||||||
}
|
}
|
||||||
$jsonData = json_decode($json, TRUE);
|
$jsonData = json_decode($json, TRUE);
|
||||||
if (!$jsonData) {
|
if ($jsonData === NULL) {
|
||||||
return FALSE;
|
return FALSE; // JSON cannot be decoded or the recursion limit has been reached.
|
||||||
}
|
}
|
||||||
return $return_as_string ? $json : $jsonData;
|
return $return_as_string ? $json : $jsonData;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue