Merge branch 'master' into JSON-202

1 year ago · 5c18538d26
parent 0da54e85eb e5bd4a0b9e
commit 5c18538d26
1 changed files with 1 additions and 1 deletions
--- a/server/pEp-types.cc
+++ b/server/pEp-types.cc
@ -248,7 +248,7 @@ message* from_json<message*>(const js::Value& v)
 	msg->references = from_json_object<stringlist_t*, js::array_type>(o, "references");
 	// TODO: refered_by
 	
-	msg->keywords = from_json_object<stringlist_t*, js::int_type>(o, "keywords");
+	msg->keywords = from_json_object<stringlist_t*, js::array_type>(o, "keywords");
 	msg->comments = from_json_object<char*, js::str_type>(o, "comments");
 	msg->opt_fields = from_json_object<stringpair_list_t*, js::array_type>(o, "opt_fields");
 	msg->enc_format = from_json_object<PEP_enc_format, js::int_type>(o, "enc_format");