From cd8707207b94cf1cee334792128e47086565bea4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= <sybren@stuvel.eu>
Date: Thu, 22 Sep 2016 10:33:51 +0200
Subject: [PATCH] Made format_undertitle() Jinja filter None-safe

---
 pillar/web/jinja.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pillar/web/jinja.py b/pillar/web/jinja.py
index 97855d39..a342fe88 100644
--- a/pillar/web/jinja.py
+++ b/pillar/web/jinja.py
@@ -22,6 +22,10 @@ def format_undertitle(s):
     Replaces underscores with spaces, and then applies Jinja2's own title filter.
     """
 
+    # Just keep empty strings and Nones as they are.
+    if not s:
+        return s
+
     return jinja2.filters.do_title(s.replace('_', ' '))