diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-07-17 12:34:38 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-07-17 12:34:38 -0400 |
| commit | df3a8b183c4e6b50b05ba3c4514563619927c924 (patch) | |
| tree | cf26a75910f51a0297c8d23cf758b1b38babc536 /doc | |
| parent | 4bc6f6cb961232dc1b30224e1c7fc875f3bc65f4 (diff) | |
| download | ikiwiki-df3a8b183c4e6b50b05ba3c4514563619927c924.tar ikiwiki-df3a8b183c4e6b50b05ba3c4514563619927c924.tar.gz | |
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 'doc')
| -rw-r--r-- | doc/smileys.mdwn | 78 |
1 files changed, 39 insertions, 39 deletions
diff --git a/doc/smileys.mdwn b/doc/smileys.mdwn index 54ac53979..65d088326 100644 --- a/doc/smileys.mdwn +++ b/doc/smileys.mdwn @@ -1,45 +1,45 @@ This page is used to control what smileys are supported by the wiki. Just write the text of a smiley to display it. -* \:) [[smileys/smile.png]] -* \:-) [[smileys/smile.png]] -* \:D [[smileys/biggrin.png]] -* \:-D [[smileys/biggrin.png]] -* \B) [[smileys/smile2.png]] -* \B-) [[smileys/smile2.png]] -* \:)) [[smileys/smile3.png]] -* \:-)) [[smileys/smile3.png]] -* \;) [[smileys/smile4.png]] -* \;-) [[smileys/smile4.png]] -* \:\ [[smileys/ohwell.png]] -* \:-\ [[smileys/ohwell.png]] -* \:/ [[smileys/ohwell.png]] -* \:-/ [[smileys/ohwell.png]] -* \:| [[smileys/neutral.png]] -* \:-| [[smileys/neutral.png]] -* \>:> [[smileys/devil.png]] -* \X-( [[smileys/angry.png]] -* \<:( [[smileys/frown.png]] -* \:( [[smileys/sad.png]] -* \:-( [[smileys/sad.png]] -* \:-? [[smileys/tongue.png]] -* \:-P [[smileys/tongue.png]] -* \:o [[smileys/redface.png]] -* \|) [[smileys/tired.png]] -* \|-) [[smileys/tired.png]] -* \{OK} [[smileys/thumbs-up.png]] -* \{X} [[smileys/icon-error.png]] -* \{i} [[smileys/icon-info.png]] -* \(./) [[smileys/checkmark.png]] -* \(!) [[smileys/idea.png]] -* \[!] [[smileys/attention.png]] -* \/!\ [[smileys/alert.png]] -* \(?) [[smileys/question.png]] -* \{*} [[smileys/star_on.png]] -* \{o} [[smileys/star_off.png]] -* \{1} [[smileys/prio1.png]] -* \{2} [[smileys/prio2.png]] -* \{3} [[smileys/prio3.png]] +* \\:) [[smileys/smile.png]] +* \\:-) [[smileys/smile.png]] +* \\:D [[smileys/biggrin.png]] +* \\:-D [[smileys/biggrin.png]] +* \\B) [[smileys/smile2.png]] +* \\B-) [[smileys/smile2.png]] +* \\:)) [[smileys/smile3.png]] +* \\:-)) [[smileys/smile3.png]] +* \\;) [[smileys/smile4.png]] +* \\;-) [[smileys/smile4.png]] +* \\:\ [[smileys/ohwell.png]] +* \\:-\ [[smileys/ohwell.png]] +* \\:/ [[smileys/ohwell.png]] +* \\:-/ [[smileys/ohwell.png]] +* \\:| [[smileys/neutral.png]] +* \\:-| [[smileys/neutral.png]] +* \\>:> [[smileys/devil.png]] +* \\X-( [[smileys/angry.png]] +* \\<:( [[smileys/frown.png]] +* \\:( [[smileys/sad.png]] +* \\:-( [[smileys/sad.png]] +* \\:-? [[smileys/tongue.png]] +* \\:-P [[smileys/tongue.png]] +* \\:o [[smileys/redface.png]] +* \\|) [[smileys/tired.png]] +* \\|-) [[smileys/tired.png]] +* \\{OK} [[smileys/thumbs-up.png]] +* \\{X} [[smileys/icon-error.png]] +* \\{i} [[smileys/icon-info.png]] +* \\(./) [[smileys/checkmark.png]] +* \\(!) [[smileys/idea.png]] +* \\[!] [[smileys/attention.png]] +* \\/!\ [[smileys/alert.png]] +* \\(?) [[smileys/question.png]] +* \\{*} [[smileys/star_on.png]] +* \\{o} [[smileys/star_off.png]] +* \\{1} [[smileys/prio1.png]] +* \\{2} [[smileys/prio2.png]] +* \\{3} [[smileys/prio3.png]] For example: {*} B) {*} |