lib.xml.render-term: quote strings

2015-03-20 10:58:11 +01:00 · 2015-03-20 10:58:11 +01:00 · 270ceb7676
commit 270ceb7676
parent 763a81ac08
1 changed files with 6 additions and 2 deletions
--- a/lib/xml.nix
+++ b/lib/xml.nix
@ -68,12 +68,16 @@ rec {
        bool = toJSON content;
        int = toJSON content;
        list = concatMapStrings render content;
-        string = content;
+        string = quote content;
      };
  in
    { name, attrs, content }:
+    # XXX we're currently encoding too much information with `null`..
    if name == null
-      then ""
+      then
+        if content == null
+          then ""
+          else content
      else let
        attrs' = render-attrs attrs;
        content' = render-content content;