Merge remote-tracking branch 'gitorious/master'

2011-06-21 19:13:07 +02:00
parent 4e5a55787b f439193628
commit 3efb084809
3 changed files with 33 additions and 7 deletions
--- a/mediagoblin/util.py
+++ b/mediagoblin/util.py
@@ -373,6 +373,10 @@ HTML_CLEANER = Cleaner(


 def clean_html(html):
+    # clean_html barfs on an empty string
+    if not html:
+        return u''
+
    return HTML_CLEANER.clean_html(html)