(bug 2021)(bug 1937) Move dash replacement to a later stage, so that all links are...

diff --git a/includes/Parser.php b/includes/Parser.php
index 8027b0a..f286cd6 100644 (file)
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -184,13 +184,6 @@ class Parser
 
                $text = $this->internalParse( $text );
 
-               $dashReplace = array(
-                       '/ - /' => " – ", # N dash
-                       '/(?<=[0-9])-(?=[0-9])/' => "&ndash;", # N dash between numbers
-                       '/ -- /' => "&nbsp;&mdash; " # M dash
-               );
-               $text = preg_replace( array_keys($dashReplace), array_values($dashReplace), $text );
-               
                
                $text = $this->unstrip( $text, $this->mStripState );
                
@@ -213,6 +206,13 @@ class Parser
 
                $this->replaceLinkHolders( $text );
 
+               $dashReplace = array(
+                       '/ - /' => "&nbsp;&ndash; ", # N dash
+                       '/(?<=[0-9])-(?=[0-9])/' => "&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.