diff MoinMoin/PageGraphicalEditor.py @ 779:9834dda36973

Added conflict icon in RecentChanges, refactored conflict handling in the code. Translators, esp. german translators!, there seems to be an outdated string. You will see it on the editing conflict.
author Alexander Schremmer <alex AT alexanderweb DOT de>
date Fri, 02 Jun 2006 00:07:16 +0200
parents 016a8a3ef354
children f3c1ea6ef86e
line wrap: on
line diff
--- a/MoinMoin/PageGraphicalEditor.py	Sun May 28 01:54:35 2006 +0200
+++ b/MoinMoin/PageGraphicalEditor.py	Fri Jun 02 00:07:16 2006 +0200
@@ -141,6 +141,8 @@
             # page creation
             rev = 0
 
+        self.setConflict(bool(conflict_msg))
+        
         # Page editing is done using user language
         self.request.setContentLanguage(self.request.lang)