Merge branch 'always-set-language-on-export' into without-pal

namespaces
Pål Jørgensen 2014-09-23 12:06:01 +02:00
commit 2b12bf4441
1 changed files with 3 additions and 1 deletions

View File

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