diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-03-21 02:43:20 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-03-21 02:43:20 -0400 |
| commit | 44824dba1bc9e03499e91f15234764e8739fcff8 (patch) | |
| tree | 8d98708a222477219f110c58a9f83c129340eba2 /doc | |
| parent | 628467125c319b623af0d60dd1e2c5817db3b1d4 (diff) | |
| download | ikiwiki-44824dba1bc9e03499e91f15234764e8739fcff8.tar ikiwiki-44824dba1bc9e03499e91f15234764e8739fcff8.tar.gz | |
smiley: Detect smileys inside pre and tags, and do not expand.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/bugs/RecentChanges_contains_invalid_XHTML.mdwn | 4 | ||||
| -rw-r--r-- | doc/bugs/Smileys_in_the_block_code.mdwn | 3 | ||||
| -rw-r--r-- | doc/bugs/wiki_links_still_processed_inside_code_blocks.mdwn | 4 |
3 files changed, 10 insertions, 1 deletions
diff --git a/doc/bugs/RecentChanges_contains_invalid_XHTML.mdwn b/doc/bugs/RecentChanges_contains_invalid_XHTML.mdwn index fe5366760..f283bfa65 100644 --- a/doc/bugs/RecentChanges_contains_invalid_XHTML.mdwn +++ b/doc/bugs/RecentChanges_contains_invalid_XHTML.mdwn @@ -13,7 +13,7 @@ plugin which end up wrapped in a `<pre>` tag in the inline diff output. `<img>` tags is not allowed within a `<pre>` block. Maybe the smiley plugin should be disabled on [[RecentChanges]]? -> See [[Smileys_in_the_block_code]] --[[Joey]] +> See [[Smileys_in_the_block_code]], which is now fixed. --[[Joey]] See the [validator output][validate] for more details. @@ -51,4 +51,6 @@ after installing the most recent version of Text::Markdown from CPAN. Note that the above patch for the redirect tag is still applicable and the smiley issue remains open. --[[JasonBlevins]] +> This bug is [[done]], all issues are fixed. --[[Joey]] + [[tag patch]] diff --git a/doc/bugs/Smileys_in_the_block_code.mdwn b/doc/bugs/Smileys_in_the_block_code.mdwn index 08ff90789..b7854705b 100644 --- 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]] diff --git a/doc/bugs/wiki_links_still_processed_inside_code_blocks.mdwn b/doc/bugs/wiki_links_still_processed_inside_code_blocks.mdwn index 744f26f4c..c4e4ba6ef 100644 --- a/doc/bugs/wiki_links_still_processed_inside_code_blocks.mdwn +++ b/doc/bugs/wiki_links_still_processed_inside_code_blocks.mdwn @@ -41,3 +41,7 @@ and have it render like: > > In the case of either bug, no, I don't have an idea of a solution yet. > --[[Joey]] + +> I've now solved a similar bug involving the smiley plugin. The code used +> there should give some strong hints how to fix this bug, though I haven't +> tried to apply the method yet. --[[Joey]] |