fixed edit conflict bug with sections

diff --git a/includes/Article.php b/includes/Article.php
index adfe9a4..c6dd43a 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -429,9 +429,10 @@ class Article {
                        }
                        # Article exists. Check for edit conflict.
                        # Don't check for conflict when appending a comment - this should always work
+                       # switch from section editing to normal editing in edit conflict
 
                        $this->clear(); # Force reload of dates, etc.
-                       if ( $section!="new" && ( $this->getTimestamp() != $wpEdittime ) ) { $isConflict = true; }
+                       if ( $section!="new" && ( $this->getTimestamp() != $wpEdittime ) ) { $isConflict = true;$section="";$wpSection=""; }
                        $u = $wgUser->getID();
 
                        # Supress edit conflict with self