diff --git a/VERSION b/VERSION index 70772022..1ff6dcfe 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.9.12-beta+timestamp.2015.01.12.20.38.57 +Version 2.9.12-beta+timestamp.2015.01.12.20.53.19 diff --git a/gluon/html.py b/gluon/html.py index ee491479..7b88a87f 100644 --- a/gluon/html.py +++ b/gluon/html.py @@ -850,7 +850,7 @@ class DIV(XmlComponent): """ components = [] for c in self.components: - if isinstance(c, allowed_parents): + if isinstance(c, (allowed_parents,CAT)): pass elif wrap_lambda: c = wrap_lambda(c)