Merge github.com:web2py/web2py

2013-02-09 02:27:16 +01:00
parent 2eeb1e74b2 66c3855e23
commit 211462ecbc
26 changed files with 836 additions and 193 deletions
@@ -5092,7 +5092,12 @@ class Wiki(object):
                url = URL(args=('_edit', slug))
                return dict(content=A('Create page "%s"' % slug, _href=url, _class="btn"))
            else:
-                return dict(content=XML(self.fix_hostname(page.html)))
+                return dict(title=page.title,
+                            slug=page.slug,
+                            content=XML(self.fix_hostname(page.html)),
+                            tags=page.tags,
+                            created_on=page.created_on,
+                            modified_on=page.modified_on)
        elif current.request.extension == 'load':
            return self.fix_hostname(page.html) if page else ''
        else: