fixed issue 1241 with auth.wiki content error, thanks Alan

2012-12-24 11:23:30 -06:00
parent a0a9e92fc1
commit bd923806be
2 changed files with 5 additions and 2 deletions
@@ -1 +1 @@
-Version 2.4.1-alpha.1+timestamp.2012.12.24.11.20.54
+Version 2.4.1-alpha.1+timestamp.2012.12.24.11.22.50
@@ -3325,7 +3325,10 @@ class Auth(object):
        if resolve:
            action = str(current.request.args(0)).startswith("_")
            if slug and not action:
-                wiki = self._wiki.read(slug)['content']
+                wiki = self._wiki.read(slug)
+                if isinstance(wiki, dict) and wiki.has_key('content'):
+                    # We don't want to return a dict object, just the wiki
+                    wiki = wiki['content']
            else:
                wiki = self._wiki()
            if isinstance(wiki, basestring):