[geeklog-hg] geeklog: Merged with upstream

[geeklog-cvs at lists.geeklog.net]

changeset 9166:b568b60e6f2c
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/b568b60e6f2c
user: Tom <websitemaster at cogeco.net>
date: Thu Jul 04 15:19:09 2013 -0400
description:
Merged with upstream

diffstat:

 system/classes/story.class.php |  7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diffs (17 lines):

diff -r dc9a49a5d620 -r b568b60e6f2c system/classes/story.class.php
--- a/system/classes/story.class.php	Thu Jul 04 15:12:47 2013 -0400
+++ b/system/classes/story.class.php	Thu Jul 04 15:19:09 2013 -0400
@@ -1822,6 +1822,13 @@
     function _editUnescape($in)
     {
         if (($this->_postmode == 'html') || ($this->_postmode == 'wikitext')) {
+
+            // replace any \ with \ (see COM_checkHTML)
+            $in = str_replace('\', '\\', $in);
+
+            // Replace any $ with $ (see COM_checkHTML)
+            $in = str_replace('$', '$', $in);
+
             /* Raw and code blocks need entity decoding. Other areas do not.
              * otherwise, annoyingly, < will end up as < on preview 1, on
              * preview 2 it'll be stripped by KSES. Can't beleive I missed that