Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
wiki: Correct a failure when editing a page.
Browse files Browse the repository at this point in the history
Occurs when the previous revision is hidden.
  • Loading branch information
andre-d authored and spladug committed Dec 6, 2012
1 parent b020ee7 commit 0fbe7f6
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
6 changes: 4 additions & 2 deletions r2/r2/controllers/validator/wiki.py
Expand Up @@ -208,9 +208,11 @@ def run(self, page):
return (page, page != original_page) return (page, page != original_page)


class VWikiPage(VWikiPageName): class VWikiPage(VWikiPageName):
def __init__(self, param, required=True, restricted=True, modonly=False, **kw): def __init__(self, param, required=True, restricted=True, modonly=False,
allow_hidden_revision=True, **kw):
self.restricted = restricted self.restricted = restricted
self.modonly = modonly self.modonly = modonly
self.allow_hidden_revision = allow_hidden_revision
self.required = required self.required = required
Validator.__init__(self, param, **kw) Validator.__init__(self, param, **kw)


Expand Down Expand Up @@ -254,7 +256,7 @@ def validversion(self, version, pageid=None):
return return
try: try:
r = WikiRevision.get(version, pageid) r = WikiRevision.get(version, pageid)
if r.is_hidden and not c.is_wiki_mod: if not self.allow_hidden_revision and (r.is_hidden and not c.is_wiki_mod):
self.set_error('HIDDEN_REVISION', code=403) self.set_error('HIDDEN_REVISION', code=403)
raise AbortWikiError raise AbortWikiError
return r return r
Expand Down
2 changes: 1 addition & 1 deletion r2/r2/controllers/wiki.py
Expand Up @@ -76,7 +76,7 @@ class WikiController(RedditController):
allow_stylesheets = True allow_stylesheets = True


@wiki_validate(pv=VWikiPageAndVersion(('page', 'v', 'v2'), required=False, @wiki_validate(pv=VWikiPageAndVersion(('page', 'v', 'v2'), required=False,
restricted=False), restricted=False, allow_hidden_revision=False),
page_name=VWikiPageName('page')) page_name=VWikiPageName('page'))
def GET_wiki_page(self, pv, page_name): def GET_wiki_page(self, pv, page_name):
page, version, version2 = pv page, version, version2 = pv
Expand Down

0 comments on commit 0fbe7f6

Please sign in to comment.