Merge branch 'master' into stable

2014-11-11 11:37:12 +01:00 · 2014-11-11 11:37:12 +01:00 · e581690ce6
parent 57db1d9926 6e17c540fc
commit e581690ce6
1 changed files with 1 additions and 1 deletions
--- a/h5p.classes.php
+++ b/h5p.classes.php
@ -1433,7 +1433,7 @@ Class H5PExport {
      'title' => $content['title'],
      // 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',
+      'language' => (isset($content['language']) && strlen(trim($content['language'])) !== 0) ? $content['language'] : 'und',
      'mainLibrary' => $content['library']['name'],
      'embedTypes' => $embedTypes,
    );