fixed issue 721, xml not callable oddity, thanks psathvik

2012-03-19 15:55:49 -05:00
parent ec811fe765
commit 54df20f543
2 changed files with 2 additions and 2 deletions
@@ -1 +1 @@
-Version 1.99.7 (2012-03-19 15:51:10) dev
+Version 1.99.7 (2012-03-19 15:55:45) dev
@@ -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