1.1 --- a/actions/ApproveChanges.py Thu Oct 13 21:29:22 2011 +0200
1.2 +++ b/actions/ApproveChanges.py Thu Oct 13 22:48:25 2011 +0200
1.3 @@ -85,7 +85,6 @@
1.4 target_page_name = get_target_page_name(self.pagename)
1.5 target_page = PageEditor(request, target_page_name)
1.6
1.7 - # Save the target page, removing any protective ACL.
1.8 # First, the displayed revision must be retrieved.
1.9
1.10 form = get_form(request)
1.11 @@ -100,7 +99,10 @@
1.12
1.13 page = Page(request, self.page.page_name, rev=rev)
1.14 body = page.get_raw_body()
1.15 - body = remove_access_control(request, body)
1.16 +
1.17 + # Save the target page, removing any introduced directives.
1.18 +
1.19 + body = remove_directives(body, ["acl", "parent-revision"])
1.20
1.21 try:
1.22 target_page.saveText(body, 0, comment=_("Changes to page approved from queue revision %d.") % rev)