* (bug 2462 etc) Taking out the experimental dash conversion; it broke too

  many things for the current parser to handle cleanly

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index f8dbd46..865c898 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -154,7 +154,6 @@ Various bugfixes, small features, and a few experimental things:
 * support for external editors for files and wiki pages:
   http://meta.wikimedia.org/wiki/Help:External_editors
 * Schema reworking: http://meta.wikimedia.org/wiki/Proposed_Database_Schema_Changes/October_2004
-* New WikiSyntax: -- turns into — or – depending on context
 * (bug 15) Allow editors to view diff of their change before actually submitting an edit
 * (bug 190) Hide your own edits on the watchlist
 * (bug 510): Special:Randompage now works for other namespaces than NS_MAIN.
@@ -307,6 +306,9 @@ Various bugfixes, small features, and a few experimental things:
 * Special:Upload now uses 'upload' permission instead of hardcoding login check
 * Add 'importupload' permission to disable direct uploads to Special:Import
 * (bug 2459) Correct escaping in Special:Log prev/next links
+* (bug 2462 etc) Taking out the experimental dash conversion; it broke too many
+  things for the current parser to handle cleanly
+
 
 === Caveats ===
 

diff --git a/includes/Parser.php b/includes/Parser.php
index d5e6a69..0d1afd7 100644 (file)
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -207,13 +207,6 @@ class Parser
 
                $this->replaceLinkHolders( $text );
 
-               $dashReplace = array(
-                       '/ - /' => " – ", # N dash
-                       '/(?<=[\d])-(?=[\d])/' => "&ndash;", # N dash between numbers
-                       '/ -- /' => "&nbsp;&mdash; " # M dash
-               );
-               $text = preg_replace( array_keys($dashReplace), array_values($dashReplace), $text );
-
                # the position of the convert() call should not be changed. it 
                # assumes that the links are all replaces and the only thing left 
                # is the <nowiki> mark.

diff --git a/maintenance/parserTests.txt b/maintenance/parserTests.txt
index a842a5b..baad7bc 100644 (file)
--- a/maintenance/parserTests.txt
+++ b/maintenance/parserTests.txt
@@ -317,7 +317,7 @@ Malformed definition list with colon
 !! input
 ;  news:alt.wikipedia.rox -- don't crash or enter an infinite loop
 !! result
-<dl><dt>  <a href="news:alt.wikipedia.rox" class='external free' title="news:alt.wikipedia.rox" rel="nofollow">news:alt.wikipedia.rox</a>&nbsp;&mdash; don't crash or enter an infinite loop
+<dl><dt>  <a href="news:alt.wikipedia.rox" class='external free' title="news:alt.wikipedia.rox" rel="nofollow">news:alt.wikipedia.rox</a> -- don't crash or enter an infinite loop
 </dt></dl>
 
 !! end