X-Git-Url: http://git.cyclocoop.org/?p=ikiwiki%2Fevents.git;a=blobdiff_plain;f=events.pm;h=2820c60b70e187471614190af77be7f8ef996d96;hp=e892d10c1548ad2bfa8d19e8aa665a0b8641f6cf;hb=d8aede5b74879b2369cd12964f0039e89231d934;hpb=d0d09f26ee4f7303bd4fc80003f2233ea5549f22

diff --git a/events.pm b/events.pm
index e892d10..2820c60 100644
--- a/events.pm
+++ b/events.pm
@@ -202,7 +202,9 @@ sub event_of_page ($%) {
 		 (keys %{$IkiWiki::typedlinks{$event}{tag}}));
 	@tags
 	 = map {
-		my $tag = $_;
+		my $tag_best = bestlink($params{page}, $_);
+		$tag_best = (length $tag_best > 0 ? $tag_best : bestlink($event, $_));
+		my $tag = (length $tag_best > 0 ? $tag_best : $_);
 		my $title
 		 = exists $pagestate{$tag}{meta}{title}
 		 ? $pagestate{$tag}{meta}{title}
@@ -211,7 +213,7 @@ sub event_of_page ($%) {
 		 = htmllink
 		 ( $params{page}
 		 , $params{destpage}
-		 , '/'.$tag
+		 , $tag
 		 , linktext => $title
 		 , noimageinline => 1
 		 , title => $title );
@@ -288,7 +290,7 @@ sub event_html ($$%) {
 			 , $date->year()
 			 );
 			add_depends($params{page}, $year_page, deptype("presence"));
-			if ($pagesources{$year_page}) {
+			if (exists $pagesources{$year_page}) {
 				$year_html
 				 = htmllink
 				 ( $params{page}
@@ -307,7 +309,7 @@ sub event_html ($$%) {
 			 , $date->month()
 			 );
 			add_depends($params{page}, $month_page, deptype("presence"));
-			if ($pagesources{$month_page}) {
+			if (exists $pagesources{$month_page}) {
 				$month_html
 				 = htmllink
 				 ( $params{page}
@@ -327,7 +329,7 @@ sub event_html ($$%) {
 			 , $date->day()
 			 );
 			add_depends($params{page}, $day_page, deptype("presence"));
-			if ($pagesources{$day_page}) {
+			if (exists $pagesources{$day_page}) {
 				$day_html
 				 = htmllink
 				 ( $params{page}