Correctly deal with invalid content in non-selfclosing tags. Fixes le…

…ss#297
CartoDB · Sep 11, 2013 · 5938ebb · 5938ebb
1 parent 2ead8da
commit 5938ebb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/lib/carto/tree/definition.js b/lib/carto/tree/definition.js
@@ -139,7 +139,7 @@ tree.Definition.prototype.symbolizersToXML = function(env, symbolizers, zoom) {
         }
         if (selfclosing) {
             xml += '/>\n';
-        } else {
+        } else if (tagcontent) {
             if (tagcontent.indexOf('<') != -1) {
                 xml += '>' + tagcontent + '</' + name + '>\n';
             } else {

diff --git a/test/errorhandling/issue297.mss b/test/errorhandling/issue297.mss
@@ -0,0 +1,4 @@
+#t {
+  text-name: invalid;
+  text-face-name: "Dejagnu";
+}
diff --git a/test/errorhandling/issue297.result b/test/errorhandling/issue297.result
@@ -0,0 +1 @@
+issue297.mss:2:2 Invalid value for text-name, the type expression is expected. invalid (of type keyword)  was given.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		issue297.mss:2:2 Invalid value for text-name, the type expression is expected. invalid (of type keyword) was given.