From df3a8b183c4e6b50b05ba3c4514563619927c924 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 17 Jul 2008 12:34:38 -0400 Subject: 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`. --- debian/changelog | 3 +++ 1 file changed, 3 insertions(+) (limited to 'debian/changelog') 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 -- cgit v1.2.3