Revert r21950; breaks four parser tests and allows various invalid constructions

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index e42954b..ddd48ee 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -40,8 +40,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   like [[User:#123|#123]]
 * Use the standard HTTP fetch functions when retrieving remote wiki pages
   through transwiki, so we can take advantage of cURL goodies if available
-* (bug 9156) Section edit links break if wikitext headings have non-whitespace
-  after them on the line
 
 == Maintenance script changes since 1.10 ==
 

diff --git a/includes/Parser.php b/includes/Parser.php
index 3a52f24..740dbd2 100644 (file)
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -4583,7 +4583,7 @@ class Parser
                                .+?  # Section title...
                                \\2  # Ending = count must match start
                                (?:$comment|<\/?noinclude>|[ \\t]+)* # Trailing whitespace ok
-                               # Bug 9156: don't require EOL here
+                               $
                        |
                                <h([1-6])\b.*?>
                                .*?