diff --git a/wiki-lenny/local/macro/RandomPageInclude.py b/wiki-lenny/local/macro/RandomPageInclude.py index c885648c..dde82da8 100644 --- a/wiki-lenny/local/macro/RandomPageInclude.py +++ b/wiki-lenny/local/macro/RandomPageInclude.py @@ -55,8 +55,7 @@ def execute(macro, text, args_re=re.compile(_args_re_pattern), title_re=re.compi # Search the pages and return the results query = search.QueryParser(regex=1).parse_query(args.group('name')) - results = search.searchPages(request, query) - #results.sortByPagename() + results = search.searchPages(request, query, sort='page_name') pagelist = [results.hits[qnumber].page_name] # prepare including page @@ -190,7 +189,7 @@ def execute(macro, text, args_re=re.compile(_args_re_pattern), title_re=re.compi strfile = StringIO.StringIO() request.redirect(strfile) try: - #cid = request.makeUniqueID("Include_%s" % wikiutil.quoteWikinameFS(inc_page.page_name)) + cid = request.make_unique_id("Include_%s" % wikiutil.quoteWikinameFS(inc_page.page_name)) inc_page.send_page(content_only=1) #, content_id=cid) result.append(strfile.getvalue()) finally: