diff --git a/VERSION b/VERSION index 820b0a2e..edf46ca6 100644 --- a/VERSION +++ b/VERSION @@ -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 diff --git a/gluon/tools.py b/gluon/tools.py index abdc61ba..fd0f098a 100644 --- a/gluon/tools.py +++ b/gluon/tools.py @@ -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):