diff --git a/Makefile b/Makefile index d0c03e2e..3193225d 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ update: wget -O gluon/contrib/simplejsonrpc.py http://rad2py.googlecode.com/hg/ide2py/simplejsonrpc.py echo "remember that pymysql was tweaked" src: - echo 'Version 2.0.9 ('`date +%Y-%m-%d\ %H:%M:%S`') stable' > VERSION + echo 'Version 2.0.9 ('`date +%Y-%m-%d\ %H:%M:%S`') dev' > VERSION ### rm -f all junk files make clean ### clean up baisc apps diff --git a/VERSION b/VERSION index d6d0992d..8b0e830a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.9 (2012-09-27 22:28:55) stable +Version 2.0.9 (2012-09-28 08:51:08) dev diff --git a/gluon/tools.py b/gluon/tools.py index bf088403..e1016c45 100644 --- a/gluon/tools.py +++ b/gluon/tools.py @@ -4920,7 +4920,7 @@ class Wiki(object): query = query&(db.wiki_page.created_by==self.auth.user_id) pages = db(query).select(count, *fields,**dict(orderby=orderby or ~count, - groupby=db.wiki_page.id, + groupby=reduce(lambda a,b:a|b,fields), distinct=True, limitby=limitby)) if request.extension in ('html','load'):