Revert r45671 "Added "__\" magic word to eat up all whitespace and newlines to the...

Unplanned syntax change.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 9ca6a6b..ae49192 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -31,9 +31,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   passing "uploadmsg" parameter in the url
 * (bug 9947) Add PROTECTIONLEVEL parser function to return the protection level
   for the current page for a given action
-* Added "__\" magic word to eat up all whitespace and newlines to the next 
-  non-whitespace character, to facilitate writing readable template code where
-  whitespace is significant. 
 * (bug 17002) Add &minor= and &summary= as parameters in the url when editing,
   to automatically add a summary or a minor edit.
 * (bug 16852) padleft and padright now accept multiletter pad characters

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 40b5b97..7fcfb90 100644 (file)
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -327,12 +327,6 @@ class Parser
                $text = $this->internalParse( $text );
                $text = $this->mStripState->unstripGeneral( $text );
 
-               # To make wikitext easier to read where significant 
-               # whitespace is a problem, '__\' will be eaten up along with 
-               # all whitespace and newlines that follow it, up to the next 
-               # non-whitespace character. (Compare 'dnl' from m4.)
-               $text = preg_replace('/__\\\\\s*/', '', $text);
-
                # Clean up special characters, only run once, next-to-last before doBlockLevels
                $fixtags = array(
                        # french spaces, last one Guillemet-left