From 0935e380c57b3c7e0cf3ecae587cca945f4eceb3 Mon Sep 17 00:00:00 2001 From: joey Date: Thu, 20 Sep 2007 19:23:43 +0000 Subject: [PATCH] * tag: Add taglink preprocessor directive, supporting visible tag links. * map: Fully specify paths to links to avoid issues when the bestlink didn't point to the correct page. --- IkiWiki/Plugin/map.pm | 2 +- debian/changelog | 6 ++++-- ...oes_not_link_directory_for_which_a_file_also_exists.mdwn | 4 +++- po/ikiwiki.pot | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm index 1194f6ed2..8037db773 100644 --- a/IkiWiki/Plugin/map.pm +++ b/IkiWiki/Plugin/map.pm @@ -23,7 +23,7 @@ sub preprocess (@) { #{{{ my @mapitems = (); foreach my $page (keys %pagesources) { if (pagespec_match($page, $params{pages}, location => $params{page})) { - push @mapitems, $page; + push @mapitems, "/".$page; } } diff --git a/debian/changelog b/debian/changelog index d0f1e99aa..fa7951c71 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,12 @@ ikiwiki (2.9) UNRELEASED; urgency=low * Fix copyright and licence styling. - * Add taglink preprocessor directive, supporting visible tag links. + * tag: Add taglink preprocessor directive, supporting visible tag links. Closes: #443344 + * map: Fully specify paths to links to avoid issues when the bestlink + didn't point to the correct page. - -- Joey Hess Thu, 20 Sep 2007 14:57:52 -0400 + -- Joey Hess Thu, 20 Sep 2007 15:21:29 -0400 ikiwiki (2.8) unstable; urgency=low diff --git a/doc/bugs/map_does_not_link_directory_for_which_a_file_also_exists.mdwn b/doc/bugs/map_does_not_link_directory_for_which_a_file_also_exists.mdwn index bf5de2804..f635351c9 100644 --- a/doc/bugs/map_does_not_link_directory_for_which_a_file_also_exists.mdwn +++ b/doc/bugs/map_does_not_link_directory_for_which_a_file_also_exists.mdwn @@ -1,3 +1,5 @@ [[meta title="map does not link entries which are equal to basename(current_page)"]] -On , the top-level `factors` entry is not linked to the corresponding page. Looking at , this must be because the page name is the same as the entry name, and ikiwiki probably doesn't take the complete path of subpages into account. \ No newline at end of file +On , the top-level `factors` entry is not linked to the corresponding page. Looking at , this must be because the page name is the same as the entry name, and ikiwiki probably doesn't take the complete path of subpages into account. + +[[fixed|done]] --[[Joey]] diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index d15ee8ff1..711618f15 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-09-20 14:58-0400\n" +"POT-Creation-Date: 2007-09-20 15:21-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n"