changeset 1162:3e2b4beb65ed

Moved conflict state detection again into another function.
author Alexander Schremmer <alex AT alexanderweb DOT de>
date Wed, 09 Aug 2006 17:22:47 +0200
parents 84ca2d77b8e4
children eb0700881a98
files MoinMoin/PageEditor.py
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/PageEditor.py	Wed Aug 09 17:13:41 2006 +0200
+++ b/MoinMoin/PageEditor.py	Wed Aug 09 17:22:47 2006 +0200
@@ -808,6 +808,9 @@
 
         self.copypage()
 
+        # remember conflict state
+        self.setConflict(wikiutil.containsConflictMarker(text))
+
         # Write always on the standard directory, never change the
         # underlay directory copy!
         pagedir = self.getPagePath(use_underlay=0, check_create=0)
@@ -918,9 +921,6 @@
         backup_url = self._make_backup(newtext, **kw)
         action = kw.get('action', 'SAVE')
 
-        # remember conflict state
-        self.setConflict(wikiutil.containsConflictMarker(newtext))
-
         #!!! need to check if we still retain the lock here
         #!!! rev check is not enough since internal operations use "0"