* Fixed unclosed <p> tag

[lhc/web/wiklou.git] / includes / EditPage.php

diff --git a/includes/EditPage.php b/includes/EditPage.php
index c1ffe75..af4ab97 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -458,6 +458,13 @@ class EditPage {
                                        }
                                }
                                
+                               // Save errors may fall down to the edit form, but we've now
+                               // merged the section into full text. Clear the section field
+                               // so that later submission of conflict forms won't try to
+                               // replace that into a duplicated mess.
+                               $this->textbox1 = $text;
+                               $this->section = '';
+                               
                                if (wfRunHooks('ArticleSave', array(&$this->mArticle, &$wgUser, &$text,
                                                                                                        &$this->summary, &$this->minoredit,
                                                                                                        &$this->watchthis, &$sectionanchor)))
@@ -470,9 +477,9 @@ class EditPage {
                                                                                                                                $this->summary, $this->minoredit,
                                                                                                                                $this->watchthis, $sectionanchor));
                                                return;
+                                       } else {
+                                               $isConflict = true;
                                        }
-                                       else
-                                         $isConflict = true;
                                }
                        }
                }