From: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Date: Fri, 19 Aug 2011 11:24:53 +0000 (+0200)
Subject: Merge branch 'master' into with-dvcs
X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/fdd62169ba22c4c1be2f2306b5339eadd74ffb6d

Merge branch 'master' into with-dvcs
---

fdd62169ba22c4c1be2f2306b5339eadd74ffb6d
diff --cc redakcja/static/js/wiki/xslt.js
index 4f562a2b,9efeba3b..ff36666f
--- a/redakcja/static/js/wiki/xslt.js
+++ b/redakcja/static/js/wiki/xslt.js
@@@ -253,13 -253,8 +253,13 @@@ HTMLSerializer.prototype.serialize = fu
  				break;
  			case TEXT_NODE:
  				self.result += text_buffer;
- 				text_buffer = token.node.nodeValue;
+ 				text_buffer = token.node.nodeValue.replace('&', '&amp;').replace('<', '&lt;');
  				break;
 +            case COMMENT_NODE:
 +                self.result += text_buffer;
 +                text_buffer = '';
 +                self.result += '<!--' + token.node.nodeValue + '-->';
 +                break;
  		};
  	};
      self.result += text_buffer;