Index: /MediaWiki/trunk/FCKeditorParser.body.php
===================================================================
--- /MediaWiki/trunk/FCKeditorParser.body.php	(revision 1866)
+++ /MediaWiki/trunk/FCKeditorParser.body.php	(revision 1867)
@@ -45,8 +45,13 @@
 	 * @return string
 	 */
-	private function fck_addToStrtr($text) {
+	private function fck_addToStrtr($text, $replaceLineBreaks = true) {
 		$key = 'Fckmw'.$this->fck_mw_strtr_span_counter.'fckmw';
 		$this->fck_mw_strtr_span_counter++;
-		$this->fck_mw_strtr_span[$key] = str_replace(array("\r\n", "\n", "\r"),"fckLR",$text);
+		if ($replaceLineBreaks) {
+			$this->fck_mw_strtr_span[$key] = str_replace(array("\r\n", "\n", "\r"),"fckLR",$text);
+		}
+		else {
+			$this->fck_mw_strtr_span[$key] = $text;
+		}
 		return $key;
 	}
@@ -288,10 +293,10 @@
 				# Remove the comment, leading and trailing
 				# spaces, and leave only one newline.
-				$replacement = $this->fck_addToStrtr(substr($text, $spaceStart, $spaceLen+1));
+				$replacement = $this->fck_addToStrtr(substr($text, $spaceStart, $spaceLen+1), false);
 				$text = substr_replace($text, $replacement."\n", $spaceStart, $spaceLen + 1);
 			}
 			else {
 				# Remove just the comment.
-				$replacement = $this->fck_addToStrtr(substr($text, $start, $end - $start));
+				$replacement = $this->fck_addToStrtr(substr($text, $start, $end - $start), false);
 				$text = substr_replace($text, $replacement, $start, $end - $start);
 			}
Index: /MediaWiki/trunk/mw12/FCKeditorParser_OldPP.body.php
===================================================================
--- /MediaWiki/trunk/mw12/FCKeditorParser_OldPP.body.php	(revision 1866)
+++ /MediaWiki/trunk/mw12/FCKeditorParser_OldPP.body.php	(revision 1867)
@@ -45,8 +45,13 @@
 	 * @return string
 	 */
-	private function fck_addToStrtr($text) {
+	private function fck_addToStrtr($text, $replaceLineBreaks = true) {
 		$key = 'Fckmw'.$this->fck_mw_strtr_span_counter.'fckmw';
 		$this->fck_mw_strtr_span_counter++;
-		$this->fck_mw_strtr_span[$key] = str_replace(array("\r\n", "\n", "\r"),"fckLR",$text);
+		if ($replaceLineBreaks) {
+			$this->fck_mw_strtr_span[$key] = str_replace(array("\r\n", "\n", "\r"),"fckLR",$text);
+		}
+		else {
+			$this->fck_mw_strtr_span[$key] = $text;
+		}
 		return $key;
 	}
@@ -288,10 +293,10 @@
 				# Remove the comment, leading and trailing
 				# spaces, and leave only one newline.
-				$replacement = $this->fck_addToStrtr(substr($text, $spaceStart, $spaceLen+1));
+				$replacement = $this->fck_addToStrtr(substr($text, $spaceStart, $spaceLen+1), false);
 				$text = substr_replace($text, $replacement."\n", $spaceStart, $spaceLen + 1);
 			}
 			else {
 				# Remove just the comment.
-				$replacement = $this->fck_addToStrtr(substr($text, $start, $end - $start));
+				$replacement = $this->fck_addToStrtr(substr($text, $start, $end - $start), false);
 				$text = substr_replace($text, $replacement, $start, $end - $start);
 			}