summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-07-17 12:34:38 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-07-17 12:34:38 -0400
commitdf3a8b183c4e6b50b05ba3c4514563619927c924 (patch)
treecf26a75910f51a0297c8d23cf758b1b38babc536 /debian/changelog
parent4bc6f6cb961232dc1b30224e1c7fc875f3bc65f4 (diff)
smiley escaping fixes
Smileys need to be double-escaped to work, since the smiley plugin runs as a sanitize hook, and markdown helpfully removes one level of escapes first. There were some bugs in the smiley handling code that made escaped smileys still be expanded. After unescaping a smiley, it needed to move pos forward past it or the next pass would expand it. Also, once the m//g got to the end, it seemed to loop back through and make one more pass (a difference in perl 5.10's regexp exngine? I observed that pos was undefined when this happened, so added a `last unless defined pos`.
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog3
1 files changed, 3 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 070f92a04..c3a2632c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,9 @@ ikiwiki (2.54) UNRELEASED; urgency=low
and todo items from the html shipped in it.
* parentlinks: New plugin, split out of ikiwiki core and enabled by default,
and several new fields added to allow for advanced styling. (intrigeri)
+ * smileys: Some fixes for escaped smileys.
+ * smileys: Note that smileys need to be double-escaped for the escaping to
+ work. Markdown removes one level of escaping.
[ Simon McVittie ]
* meta, inline: Support guid options, to allow forcing a particular url or