Merge branch 'master' of github.com:web2py/web2py

2015-09-20 14:07:06 -05:00
parent b47511c896 e31318eaa8
commit 0fa0dbaeea
10 changed files with 720 additions and 386 deletions
@@ -6392,7 +6392,7 @@ class Wiki(object):
            count = db.wiki_tag.wiki_page.count()
            fields = [db.wiki_page.id, db.wiki_page.slug,
                      db.wiki_page.title, db.wiki_page.tags,
-                      db.wiki_page.can_read, db.wiki+page.can_edit]
+                      db.wiki_page.can_read, db.wiki_page.can_edit]
            if preview:
                fields.append(db.wiki_page.body)
            if query is None: