Merge commit 'upstream/master'

[git.ikiwiki.info.git] / doc / bugs / Smileys_in_the_block_code.mdwn

diff --git a/doc/bugs/Smileys_in_the_block_code.mdwn b/doc/bugs/Smileys_in_the_block_code.mdwn
index 08ff90789067b68436371cbf273fa7600633adbb..b7854705b81c838062d045878aef44efd66c42d3 100644 (file)
--- a/doc/bugs/Smileys_in_the_block_code.mdwn
+++ b/doc/bugs/Smileys_in_the_block_code.mdwn
@@ -29,3 +29,6 @@ BTW, maybe converting smileys in the block code should be disabled at all?
 > Looks similar to [[wiki_links_still_processed_inside_code_blocks]]; in both
 > cases, substitution happens in a code block, which it shouldn't.
 > --[[JoshTriplett]]
+
+> [[fixed|done]], via some super duper regexp fun to notice if the smiley
+> is inside a pre or code tag. --[[Joey]]