ZO-4627: Fix omission in 7cc4d95, node.text can be None (while str(no…

…de) in objectify couldn't)
ZeitOnline · Feb 27, 2024 · 6bba217 · 6bba217
1 parent 12c3083
commit 6bba217
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/core/docs/changelog/structure.fix b/core/docs/changelog/structure.fix
@@ -0,0 +1 @@
+Handle empty lines etc correctly, e.g. in markdown fields
diff --git a/core/src/zeit/cms/content/property.py b/core/src/zeit/cms/content/property.py
@@ -112,7 +112,7 @@ def __get__(self, instance, class_):
         if node is None:
             return self.field.missing_value if self.field else None
         node = lxml.etree.fromstring(str(self.remove_namespaces(node)))
-        result = [xml.sax.saxutils.escape(node.text)]
+        result = [xml.sax.saxutils.escape(node.text or '')]
         for child in node.iterchildren():
             result.append(lxml.etree.tostring(child, encoding=str))
         return ''.join(result)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Handle empty lines etc correctly, e.g. in markdown fields