diff --git a/VERSION b/VERSION index 690f5d30..3a9ba2ba 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 1.99.7 (2012-03-19 15:51:10) dev +Version 1.99.7 (2012-03-19 15:55:45) dev diff --git a/gluon/compileapp.py b/gluon/compileapp.py index 60ceacc4..79959c67 100644 --- a/gluon/compileapp.py +++ b/gluon/compileapp.py @@ -577,7 +577,7 @@ def run_controller_in(controller, function, environment): vars = p(vars) if isinstance(vars,unicode): vars = vars.encode('utf8') - if hasattr(vars,'xml'): + elif hasattr(vars,'xml') and callable(vars.xml): vars = vars.xml() return vars