EDUCATIC
/
h5p-php-library
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merged in changed from drupal git.

namespaces
Frode Petterson 2013-09-18 10:30:12 +02:00
parent ece7b5bcde
commit 4d319b3424
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
h5p.classes.php
View File

@ -90,10 +90,10 @@ interface H5PFrameworkInterface {
* FALSE otherwise
*/
public function isPatchedLibrary($library);
/**
* Is H5P in development mode?
*
*
* @return boolean
* TRUE if H5P development mode is active
* FALSE otherwise
@ -784,12 +784,12 @@ class H5PValidator {
*/
private function getJsonData($filePath, $return_as_string = FALSE) {
$json = file_get_contents($filePath);
if (!$json) {
return FALSE;
if ($json === FALSE) {
return FALSE; // Cannot read from file.
}
$jsonData = json_decode($json, TRUE);
if (!$jsonData) {
return FALSE;
if ($jsonData === NULL) {
return FALSE; // JSON cannot be decoded or the recursion limit has been reached.
}
return $return_as_string ? $json : $jsonData;
}