From f15b34aeeda1955244f10b418d7e75f57235d734 Mon Sep 17 00:00:00 2001 From: philippe Date: Thu, 19 Aug 2010 15:02:14 +0000 Subject: --- doc/bugs/po:_po_files_instead_of_html_files.mdwn | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/bugs/po:_po_files_instead_of_html_files.mdwn b/doc/bugs/po:_po_files_instead_of_html_files.mdwn index 4b08c7c70..610a32540 100644 --- a/doc/bugs/po:_po_files_instead_of_html_files.mdwn +++ b/doc/bugs/po:_po_files_instead_of_html_files.mdwn @@ -1,4 +1,6 @@ On the home page of my wiki, when i click on the link "ikiwiki", i get the english file instead of the french file. At the bottom of this page, there is the "Links" line: Links: index index.fr templates templates.fr -When i click on "templates.fr", i get the po.file instead of html. +When i click on "templates.fr", i get the po.file instead of html. + + Sorry for the noise! I set "po_master_language" to fr and all was ok. -- cgit v1.2.3 From 2a31fb78de327432b8bf6ad5f4eed55eed0394bc Mon Sep 17 00:00:00 2001 From: philippe Date: Thu, 19 Aug 2010 15:45:31 +0000 Subject: --- doc/bugs/po:_po_files_instead_of_html_files.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/bugs/po:_po_files_instead_of_html_files.mdwn b/doc/bugs/po:_po_files_instead_of_html_files.mdwn index 610a32540..933e348c4 100644 --- a/doc/bugs/po:_po_files_instead_of_html_files.mdwn +++ b/doc/bugs/po:_po_files_instead_of_html_files.mdwn @@ -3,4 +3,4 @@ At the bottom of this page, there is the "Links" line: Links: index index.fr templates templates.fr When i click on "templates.fr", i get the po.file instead of html. - Sorry for the noise! I set "po_master_language" to fr and all was ok. + Sorry for the noise! I set "po_master_language" to fr and all was ok. [[done]]. -- cgit v1.2.3 From 6e7ae22ed22e1dc94d41203de5ddda9fac75edac Mon Sep 17 00:00:00 2001 From: "http://oblomov.myopenid.com/" Date: Thu, 19 Aug 2010 17:45:20 +0000 Subject: Report htmlscrubber/multimarkdown footnote misinteraction --- doc/bugs/htmlscrubber_breaks_multimarkdown_footnotes.mdwn | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 doc/bugs/htmlscrubber_breaks_multimarkdown_footnotes.mdwn diff --git a/doc/bugs/htmlscrubber_breaks_multimarkdown_footnotes.mdwn b/doc/bugs/htmlscrubber_breaks_multimarkdown_footnotes.mdwn new file mode 100644 index 000000000..a00ced4c5 --- /dev/null +++ b/doc/bugs/htmlscrubber_breaks_multimarkdown_footnotes.mdwn @@ -0,0 +1,13 @@ +I enabled multimarkdown to make use of footnotes in my file. I have the multimarkdown plugin, +as well as the command-line program. If I write a document with footnotes: + + This line has a footnote[^1] + + [^1]: this is the footnote + +and compile it from the cli, the reference becomes a link to the footnote and the footnote +gets a backreferencing link appended. When compiled in ikiwiki with the goodstuff plugin +enabled, the links are created but their hrefs are empty (so they do not actually act as links). +Disabling the htmlscrubber plugin fixes this issue + +[[!tag multimarkdown htmlscrubber]] -- cgit v1.2.3 From 9b9ecda62f893a2109ccdb6bcdb2358f217f7fef Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 19 Aug 2010 13:59:31 -0400 Subject: htmlscrubber: Do not scrub url anchors that contain colons. --- IkiWiki/Plugin/htmlscrubber.pm | 2 +- debian/changelog | 1 + doc/bugs/htmlscrubber_breaks_multimarkdown_footnotes.mdwn | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm index 847518178..927792f79 100644 --- a/IkiWiki/Plugin/htmlscrubber.pm +++ b/IkiWiki/Plugin/htmlscrubber.pm @@ -32,7 +32,7 @@ sub import { ); # data is a special case. Allow a few data:image/ types, # but disallow data:text/javascript and everything else. - $safe_url_regexp=qr/^(?:(?:$uri_schemes):|data:image\/(?:png|jpeg|gif)|[^:]+(?:$|[\/\?]))/i; + $safe_url_regexp=qr/^(?:(?:$uri_schemes):|data:image\/(?:png|jpeg|gif)|[^:]+(?:$|[\/\?#]))|^#/i; } sub getsetup () { diff --git a/debian/changelog b/debian/changelog index 8fee36b98..fb445a3ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ ikiwiki (3.20100816) UNRELEASED; urgency=low (and MSIE 8 in compat mode). Thanks to Iain McLaren for reporting the bug and providing access to debug it. * style.css: Use relative, not absolute font sizes. Thanks, Giuseppe Bilotta. + * htmlscrubber: Do not scrub url anchors that contain colons. -- Joey Hess Sun, 15 Aug 2010 11:45:48 -0400 diff --git a/doc/bugs/htmlscrubber_breaks_multimarkdown_footnotes.mdwn b/doc/bugs/htmlscrubber_breaks_multimarkdown_footnotes.mdwn index a00ced4c5..343037b45 100644 --- a/doc/bugs/htmlscrubber_breaks_multimarkdown_footnotes.mdwn +++ b/doc/bugs/htmlscrubber_breaks_multimarkdown_footnotes.mdwn @@ -11,3 +11,8 @@ enabled, the links are created but their hrefs are empty (so they do not actuall Disabling the htmlscrubber plugin fixes this issue [[!tag multimarkdown htmlscrubber]] + +> href was of the form: #fnref:1 , scrubbed by overzealous protocol +> scrubbing. + +[[done]] --[[Joey]] -- cgit v1.2.3 From 7d29ba2fc77d1e2b902b3742de6671a87b4d31e2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 19 Aug 2010 14:04:55 -0400 Subject: add htmlscrubber colon in url cases to test suite --- t/htmlize.t | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/t/htmlize.t b/t/htmlize.t index a7e7f8c39..a436748f9 100755 --- a/t/htmlize.t +++ b/t/htmlize.t @@ -1,7 +1,7 @@ #!/usr/bin/perl use warnings; use strict; -use Test::More tests => 26; +use Test::More tests => 32; use Encode; BEGIN { use_ok("IkiWiki"); } @@ -68,3 +68,21 @@ is(IkiWiki::htmlize("foo", "foo", "mdwn", is(IkiWiki::htmlize("foo", "foo", "mdwn", q{bar}), q{bar}, "class attribute allowed"); +is(IkiWiki::htmlize("foo", "foo", "mdwn", + q{}), + q{}, "simple anchor allowed"); +is(IkiWiki::htmlize("foo", "foo", "mdwn", + q{}), + q{}, "colon allowed in anchor"); +is(IkiWiki::htmlize("foo", "foo", "mdwn", + q{}), + q{}, "colon allowed in query string"); +is(IkiWiki::htmlize("foo", "foo", "mdwn", + q{}), + q{}, "unknown protocol blocked"); +is(IkiWiki::htmlize("foo", "foo", "mdwn", + q{}), + q{}, "simple relative anchor allowed"); +is(IkiWiki::htmlize("foo", "foo", "mdwn", + q{}), + q{}, "colon in simple relative anchor allowed"); -- cgit v1.2.3 From e65ab83d292c62f01740b68f4acdb5bf2d6d1f93 Mon Sep 17 00:00:00 2001 From: "http://oblomov.myopenid.com/" Date: Fri, 20 Aug 2010 08:19:27 +0000 Subject: --- doc/todo/support_link__40__.__41___in_pagespec.mdwn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/todo/support_link__40__.__41___in_pagespec.mdwn b/doc/todo/support_link__40__.__41___in_pagespec.mdwn index da55bce67..79809662a 100644 --- a/doc/todo/support_link__40__.__41___in_pagespec.mdwn +++ b/doc/todo/support_link__40__.__41___in_pagespec.mdwn @@ -8,3 +8,6 @@ which uses !inline to list all posts with the tag. Joey said on IRC that "probably changing the derel() function in IkiWiki.pm is the best way to do it". +> I implemented this suggestion in the simplest possible way, [[!taglink patch]] available [[here|http://git.oblomov.eu/ikiwiki/patch/f4a52de556436fdee00fd92ca9a3b46e876450fa]]. +> An alternative approach, very similar, would be to make the empty page parameter mean current page (e.g. `link()` would mean pages linking here). The patch would be very similar. +> -- GB -- cgit v1.2.3 From 87acb9ad1c009c3a6570fad09b5286b5399d86bc Mon Sep 17 00:00:00 2001 From: "http://kostix.myopenid.com/" Date: Fri, 20 Aug 2010 16:00:24 +0000 Subject: Add a comment about adding of per-wiki or per-user setting for the edit box size --- doc/todo/edit_form:_no_fixed_size_for_textarea.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/todo/edit_form:_no_fixed_size_for_textarea.mdwn b/doc/todo/edit_form:_no_fixed_size_for_textarea.mdwn index 0c45f0c90..577c3dad8 100644 --- a/doc/todo/edit_form:_no_fixed_size_for_textarea.mdwn +++ b/doc/todo/edit_form:_no_fixed_size_for_textarea.mdwn @@ -38,3 +38,5 @@ have a small resize handle in a corner, that can be dragged around. No nasty javascript needed. IMHO, this is the right solution, and I hope other browsers emulate it. [[done]] --[[Joey]] + +Wouldn't it be possible to just implement an integer-valued setting for this, accessible via the "Setup" wiki page? This would require a wiki regen, but such a setting would not be changed frequently I suppose. Also, Mediawiki has this implemented as a per-user setting (two settings, actually, -- number of rows and columns of the edit area); such a per-user setting would be the best possible implementation, but I'm not sure if ikiwiki already supports per-user settings. Please consider implementing this as the current 20 rows is a great PITA for any non-trivial page. -- cgit v1.2.3