Index: /MediaWiki/trunk/extensions/FCKeditor/FCKeditorParser.body.php
===================================================================
--- /MediaWiki/trunk/extensions/FCKeditor/FCKeditorParser.body.php	(revision 615)
+++ /MediaWiki/trunk/extensions/FCKeditor/FCKeditorParser.body.php	(revision 616)
@@ -5,4 +5,5 @@
     public static $fkc_mw_makeImage_options;
     protected $fck_mw_strtr_span;
+    protected $fck_mw_strtr_span_counter=1;
     protected $fck_mw_taghook;
     protected $fck_internal_parse_text;
@@ -60,5 +61,10 @@
             $ret .= "</span>";
         }
-        return $ret;
+        
+        $replacement = 'Fckmw'.$this->fck_mw_strtr_span_counter.'fckmw';
+        $this->fck_mw_strtr_span[$replacement] = $ret;
+        $this->fck_mw_strtr_span_counter++;
+        
+        return $replacement;
     }
 
@@ -89,5 +95,10 @@
             $ret .= "</span>";
         }
-        return $ret;
+        
+        $replacement = 'Fckmw'.$this->fck_mw_strtr_span_counter.'fckmw';
+        $this->fck_mw_strtr_span[$replacement] = $ret;
+        $this->fck_mw_strtr_span_counter++;
+        
+        return $replacement;
     }
 
@@ -269,5 +280,4 @@
             $inner = "";
             $strtr_span = array();
-            $i = 1;
             foreach ($tags as $pos=>$type) {
                 $sum += $type;
@@ -277,10 +287,10 @@
                 }
                 else if ($sum == 0) {
-                    $stringToParse .= 'Fckmw'.$i.'fckmw';
+                    $stringToParse .= 'Fckmw'.$this->fck_mw_strtr_span_counter.'fckmw';
                     $inner = htmlspecialchars(strtr(substr($text, $startingPos, $pos - $startingPos + 19), $strtr));
-                    $this->fck_mw_strtr_span['href="Fckmw'.$i.'fckmw"'] = 'href="'.$inner.'"';
-                    $this->fck_mw_strtr_span['Fckmw'.$i.'fckmw'] = '<span class="fck_mw_template">'.$inner.'</span>';
+                    $this->fck_mw_strtr_span['href="Fckmw'.$this->fck_mw_strtr_span_counter.'fckmw"'] = 'href="'.$inner.'"';
+                    $this->fck_mw_strtr_span['Fckmw'.$this->fck_mw_strtr_span_counter.'fckmw'] = '<span class="fck_mw_template">'.$inner.'</span>';
                     $startingPos = $pos + 19;
-                    $i++;
+                    $this->fck_mw_strtr_span_counter++;
                 }
                 $lastSum = $sum;