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

Merge branch 'master' into stable

semantics-font Drupal-7.x-1.0
Svein-Tore Griff With 2014-11-11 11:37:12 +01:00
parent 57db1d9926 6e17c540fc
commit e581690ce6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
h5p.classes.php
View File

@ -1433,7 +1433,7 @@ Class H5PExport {
'title' => $content['title'], 'title' => $content['title'],
// TODO - stop using 'und', this is not the preferred way. // TODO - stop using 'und', this is not the preferred way.
// Either remove language from the json if not existing, or use "language": null // Either remove language from the json if not existing, or use "language": null
'language' => isset($content['language']) ? $content['language'] : 'und', 'language' => (isset($content['language']) && strlen(trim($content['language'])) !== 0) ? $content['language'] : 'und',
'mainLibrary' => $content['library']['name'], 'mainLibrary' => $content['library']['name'],
'embedTypes' => $embedTypes, 'embedTypes' => $embedTypes,
); );