diff options
| -rw-r--r-- | IkiWiki.pm | 2 | ||||
| -rw-r--r-- | IkiWiki/Plugin/tag.pm | 3 | ||||
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | doc/bugs/No_link_for_blog_items_when_filename_contains_a_colon.mdwn | 37 | ||||
| -rw-r--r-- | doc/bugs/colon:problem/discussion.mdwn | 1 | ||||
| -rw-r--r-- | doc/plugins/tag.mdwn | 6 | ||||
| -rw-r--r-- | doc/todo/online_configuration.mdwn | 2 |
7 files changed, 51 insertions, 4 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm index 063cef8e0..c14124f79 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -538,7 +538,7 @@ sub beautify_urlpath ($) { #{{{ # Ensure url is not an empty link, and # if it's relative, make that explicit to avoid colon confusion. - if ($url !~ /\//) { + if ($url !~ /^\//) { $url="./$url"; } diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm index f0e3c223c..b0a0e53be 100644 --- a/IkiWiki/Plugin/tag.pm +++ b/IkiWiki/Plugin/tag.pm @@ -25,7 +25,8 @@ sub getopt () { #{{{ sub tagpage ($) { #{{{ my $tag=shift; - if (exists $config{tagbase} && + if ($tag !~ m{^\.?/} && + exists $config{tagbase} && defined $config{tagbase}) { $tag=$config{tagbase}."/".$tag; } diff --git a/debian/changelog b/debian/changelog index bcfb411b0..04d4fc662 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,10 @@ ikiwiki (2.55) UNRELEASED; urgency=low * All rcs backends need to implement rcs_remove. (Done for svn, git). * remove: New plugin that adds the ability to remove pages via the web. (Sponsored by The TOVA Company.) + * tag: Allow tagbase to be overridden by starting a tag with "./" or "/". + (Simon McVittie) + * Really fix bug with links to pages with names containing colons. + Previous fix mised a few cases. -- Joey Hess <joeyh@debian.org> Mon, 21 Jul 2008 11:35:46 -0400 diff --git a/doc/bugs/No_link_for_blog_items_when_filename_contains_a_colon.mdwn b/doc/bugs/No_link_for_blog_items_when_filename_contains_a_colon.mdwn index 608d09b74..313c1addd 100644 --- a/doc/bugs/No_link_for_blog_items_when_filename_contains_a_colon.mdwn +++ b/doc/bugs/No_link_for_blog_items_when_filename_contains_a_colon.mdwn @@ -22,4 +22,39 @@ In any case, `htmlscrubber` should get a new regexp, courtesy of dato: [Commit/patch be0b4f60](http://git.madduck.net/v/code/ikiwiki.git?a=commit;h=be0b4f603f918444b906e42825908ddac78b7073) fixes this. -[[done]] + +**July 21 2008:** I update this bug report as it still seems to be an issue: E.g. when creating a subpage whose name contains +a colon by inserting an appropriate wikilink in the parent page: the new page can be created using that link, but afterwards +there won't be a link to this page. Like madduck said above it seems to be htmlscrubber removing this link. However everything +works fine if the same page is being linked to from another subpage because in that case the resulting link starts with `../`. + +At the moment I see two possible solutions: + +1. let all relative links at least start with `./`. I haven't tested this. + +2. Escape the colon in page titles. I created the following patch which worked for me: + + --- IkiWiki.pm.2.53-save 2008-07-08 15:56:38.000000000 +0200 + +++ IkiWiki.pm 2008-07-21 20:41:35.000000000 +0200 + @@ -477,13 +477,13 @@ + + sub titlepage ($) { #{{{ + my $title=shift; + - $title=~s/([^-[:alnum:]:+\/.])/$1 eq ' ' ? '_' : "__".ord($1)."__"/eg; + + $title=~s/([^-[:alnum:]+\/.])/$1 eq ' ' ? '_' : "__".ord($1)."__"/eg; + return $title; + } #}}} + + sub linkpage ($) { #{{{ + my $link=shift; + - $link=~s/([^-[:alnum:]:+\/._])/$1 eq ' ' ? '_' : "__".ord($1)."__"/eg; + + $link=~s/([^-[:alnum:]+\/._])/$1 eq ' ' ? '_' : "__".ord($1)."__"/eg; + return $link; + } #}}} + +What do you think about that? Does the patch have any side-effects I didn't see? + +> I almost really fixed this in 2.53, but missed one case. All fixed now +> AFAICS. --[[Joey]] + +[[tag done]] diff --git a/doc/bugs/colon:problem/discussion.mdwn b/doc/bugs/colon:problem/discussion.mdwn new file mode 100644 index 000000000..e2856ed95 --- /dev/null +++ b/doc/bugs/colon:problem/discussion.mdwn @@ -0,0 +1 @@ +testing a link to [[colon:problem]] diff --git a/doc/plugins/tag.mdwn b/doc/plugins/tag.mdwn index a2f0c7e57..c197ae53f 100644 --- a/doc/plugins/tag.mdwn +++ b/doc/plugins/tag.mdwn @@ -24,6 +24,12 @@ tags/tech, tags/life, and tags/linux. This is a useful way to avoid having to write the full path to tags, if you want to keep them grouped together out of the way. +If you want to override the tagbase for a particular tag, you can use +something like this: + + \[[!tag ./foo]] + \[[!taglink /foo]] + [[!if test="enabled(tag)" then=""" This wiki has the tag plugin enabled, so you'll see a note below that this page is tagged with the "tags" tag. diff --git a/doc/todo/online_configuration.mdwn b/doc/todo/online_configuration.mdwn index db3b41a71..94c4c66f8 100644 --- a/doc/todo/online_configuration.mdwn +++ b/doc/todo/online_configuration.mdwn @@ -63,4 +63,4 @@ the web browser. The `rebuild` fields would be set to 1 for values that require a wiki rebuild when changed, and to 0 for values that only need the wrappers to be refreshed. -[[tag wishlist]] +[[!tag wishlist]] |