Merge 1ca2e78 into 0e19076

wagtail · May 8, 2018 · 171294a · 171294a
2 parents 0e19076 + 1ca2e78
commit 171294a
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/wagtail/admin/rich_text/converters/html_to_contentstate.py b/wagtail/admin/rich_text/converters/html_to_contentstate.py
@@ -264,16 +264,19 @@ def handle_endtag(self, name, state, contentstate):
 
 class HtmlToContentStateHandler(HTMLParser):
     def __init__(self, features=()):
-        self.paragraph_handler = BlockElementHandler('unstyled')
-        self.element_handlers = HTMLRuleset({
-            'p': self.paragraph_handler,
-            'br': LineBreakHandler(),
-        })
+        self.element_handlers = HTMLRuleset()
         for feature in features:
             rule = feature_registry.get_converter_rule('contentstate', feature)
             if rule is not None:
                 self.element_handlers.add_rules(rule['from_database_format'])
 
+        # add default rules for base elements
+        self.paragraph_handler = BlockElementHandler('unstyled')
+        self.element_handlers.add_rules({
+            'p': self.paragraph_handler,
+            'br': LineBreakHandler(),
+        })
+
         super().__init__(convert_charrefs=True)
 
     def reset(self):