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

HFP-2683 Fix empty arrays instead of groups when uploading

pull/61/head
Frode Petterson 2019-04-05 10:15:33 +02:00
parent 0b1aadbbca
commit 70278d15f4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
h5p.classes.php
View File

@ -864,7 +864,7 @@ class H5PValidator {
$valid = FALSE; $valid = FALSE;
} }
else { else {
$mainH5pData = $this->getJson($tmpPath, $zip, 'h5p.json'); $mainH5pData = $this->getJson($tmpPath, $zip, 'h5p.json', TRUE);
if ($mainH5pData === NULL) { if ($mainH5pData === NULL) {
return FALSE; // Breaking error when reading from the archive. return FALSE; // Breaking error when reading from the archive.
} }
@ -1044,7 +1044,7 @@ class H5PValidator {
* @param string $file * @param string $file
* @return mixed JSON content if valid, FALSE for invalid, NULL for breaking error. * @return mixed JSON content if valid, FALSE for invalid, NULL for breaking error.
*/ */
private function getJson($path, $zip, $file) { private function getJson($path, $zip, $file, $assoc = FALSE) {
// Get stream // Get stream
$stream = $zip->getStream($file); $stream = $zip->getStream($file);
if (!$stream) { if (!$stream) {
@ -1062,7 +1062,7 @@ class H5PValidator {
} }
// Decode the data // Decode the data
$json = json_decode($contents, TRUE); $json = json_decode($contents, $assoc);
if ($json === NULL) { if ($json === NULL) {
// JSON cannot be decoded or the recursion limit has been reached. // JSON cannot be decoded or the recursion limit has been reached.
$this->h5pF->setErrorMessage($this->h5pF->t('Unable to parse JSON from the package: %fileName', array('%fileName' => $file)), 'unable-to-parse-package'); $this->h5pF->setErrorMessage($this->h5pF->t('Unable to parse JSON from the package: %fileName', array('%fileName' => $file)), 'unable-to-parse-package');