diff -r f851ec12812f -r c0e8626a271c server/src/app/Models/Document.php --- a/server/src/app/Models/Document.php Sat Mar 05 08:49:17 2016 +0100 +++ b/server/src/app/Models/Document.php Sun Mar 06 00:29:01 2016 +0100 @@ -349,11 +349,13 @@ //put new foreach ($subjects as $newSubject) { $value = null; - if(filter_var($newSubject, FILTER_VALIDATE_URL)) { + if(is_string($newSubject) && filter_var($newSubject, FILTER_VALIDATE_URL)) { $value = new Resource($newSubject); } - else { - $value = new Literal($newSubject, "fr", null); + elseif (is_string($newSubject)) { + $value = new Literal($newSubject, null, null); + } elseif(is_array($newSubject)) { + $value = new Literal(isset($newSubject['value'])?$newSubject['value']:null, isset($newSubject['lang'])?$newSubject['lang']:null, isset($newSubject['datatype'])?$newSubject['value']:null); } $this->getProvidedCHO()->add('http://purl.org/dc/elements/1.1/subject', $value);