X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/d9b9022c13af3aa6c469df05beaa293fcf33cafc..fadb26bc1507f7fc2caaa873ad32c12f75c378aa:/IkiWiki.pm?ds=sidebyside

diff --git a/IkiWiki.pm b/IkiWiki.pm
index e75175a8d..67cd2147d 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -807,6 +807,7 @@ sub will_render ($$;$) { #{{{
 sub bestlink ($$) { #{{{
 	my $page=shift;
 	my $link=shift;
+	my $res=undef;
 	
 	my $cwd=$page;
 	if ($link=~s/^\/+//) {
@@ -821,25 +822,35 @@ sub bestlink ($$) { #{{{
 		$l.=$link;
 
 		if (exists $links{$l}) {
-			return $l;
+			$res=$l;
 		}
 		elsif (exists $pagecase{lc $l}) {
-			return $pagecase{lc $l};
+			$res=$pagecase{lc $l};
 		}
-	} while $cwd=~s{/?[^/]+$}{};
+	} while ($cwd=~s{/?[^/]+$}{} && ! defined $res);
 
-	if (length $config{userdir}) {
+	if (! defined $res && length $config{userdir}) {
 		my $l = "$config{userdir}/".lc($link);
 		if (exists $links{$l}) {
-			return $l;
+			$res=$l;
 		}
 		elsif (exists $pagecase{lc $l}) {
-			return $pagecase{lc $l};
+			$res=$pagecase{lc $l};
 		}
 	}
 
-	#print STDERR "warning: page $page, broken link: $link\n";
-	return "";
+	if (defined $res) {
+		run_hooks(tweakbestlink => sub {
+			$res=shift->(
+				page => $page,
+				link => $res);
+		});
+		return $res;
+	}
+	else {
+		#print STDERR "warning: page $page, broken link: $link\n";
+		return "";
+	}
 } #}}}
 
 sub isinlinableimage ($) { #{{{
@@ -909,6 +920,23 @@ sub abs2rel ($$) { #{{{
 } #}}}
 
 sub displaytime ($;$) { #{{{
+	my $time=shift;
+	my $format=shift;
+	if (exists $hooks{displaytime}) {
+		my $ret;
+		run_hooks(displaytime => sub {
+			$ret=shift->($time, $format)
+		});
+		return $ret;
+	}
+	else {
+		return formattime($time, $format);
+	}
+} #}}}
+
+sub formattime ($;$) { #{{{
+	# Plugins can override this function to mark up the time for
+	# display.
 	my $time=shift;
 	my $format=shift;
 	if (! defined $format) {
@@ -927,7 +955,7 @@ sub beautify_urlpath ($) { #{{{
 		$url =~ s!/index.$config{htmlext}$!/!;
 	}
 
-	run_hooks(urlpath => sub {
+	run_hooks(tweakurlpath => sub {
 		$url=shift->(url => $url);
 	});