changeset 3420:28dc1b4b53ad

merged main
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Sun, 23 Mar 2008 00:02:54 +0100
parents d6057ed413e6 (current diff) 60e0a3979520 (diff)
children d71aa6092994
files
diffstat 2 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/action/SyncPages.py	Sun Mar 23 00:02:30 2008 +0100
+++ b/MoinMoin/action/SyncPages.py	Sun Mar 23 00:02:54 2008 +0100
@@ -269,7 +269,7 @@
 
         m_pages = [elem.add_missing_pagename(local, remote) for elem in SyncPage.merge(l_pages, r_pages)]
 
-        self.log_status(self.INFO, _("Got a list of %s local and %s remote pages. This results in %s different pages over-all."),
+        self.log_status(self.INFO, _("Got a list of %s local and %s remote pages. This results in %s pages to process."),
                         (str(len(l_pages)), str(len(r_pages)), str(len(m_pages))))
 
         if params["pageMatch"]:
--- a/MoinMoin/wikisync.py	Sun Mar 23 00:02:30 2008 +0100
+++ b/MoinMoin/wikisync.py	Sun Mar 23 00:02:54 2008 +0100
@@ -321,8 +321,6 @@
         normalised_name = normalise_pagename(page_name, self.prefix)
         if normalised_name is None:
             return None
-        if not self.request.user.may.write(normalised_name):
-            return None
         page = Page(self.request, page_name)
         revno = page.get_real_rev()
         if revno == 99999999: # I love sane in-band signalling