Skip to content

Commit

Permalink
Merge pull request #49 from sunew/fix-transform
Browse files Browse the repository at this point in the history
Fix transform
  • Loading branch information
jensens committed Jul 14, 2015
2 parents 7d4ae66 + 2b03a64 commit 2c2dd00
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 4 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ Changelog
1.2.3 (2015-05-04)
------------------

- fix AttributeError: 'NoneType' object has no attribute 'getroottree' when the result is not
html / is empty.
[sunew]

- make control panel usable again. Fixed problem where skins
control panel is no longer present.
[vangheem]
Expand Down
2 changes: 1 addition & 1 deletion src/plone/app/theming/transform.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ def parseTree(self, result):

try:
return getHTMLSerializer(result, pretty_print=False)
except (TypeError, etree.ParseError):
except (AttributeError, TypeError, etree.ParseError):
return None

def transformString(self, result, encoding):
Expand Down

0 comments on commit 2c2dd00

Please sign in to comment.