Merge branch 'master' into es_17_01

# Conflicts: # examples/demo/demo.ecf # modules/node/node-safe.ecf
2017-03-01 08:51:23 +01:00
parent 2cea3cf261 13d0927c58
commit 3d2770e759
38 changed files with 1188 additions and 225 deletions
--- a/modules/taxonomy/cms_taxonomy_api.e
+++ b/modules/taxonomy/cms_taxonomy_api.e
@@ -318,7 +318,7 @@ feature -- Web forms
 									s.append_character (',')
 									s.append_character (' ')
 								end
-								if ic.item.text.has (' ') then
+								if ic.item.text.has (',') then
 									s.append_character ('"')
 									s.append (t.text)
 									s.append_character ('"')