Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

This commit is contained in:
Jacques Distler 2010-06-19 03:03:36 -05:00
commit 4c4f7a7b82
5 changed files with 29 additions and 22 deletions

View file

@ -2313,7 +2313,7 @@ end
"'" => ''',
'"' => '"',
}
TO_ESCAPE_PATTERN = Regexp.union(TO_ESCAPE.keys)
TO_ESCAPE_PATTERN = Regexp.union(*TO_ESCAPE.keys)
def escapeHTML
self.gsub(TO_ESCAPE_PATTERN){|m| TO_ESCAPE[m]}