response

[git.ikiwiki.info.git] / IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 633c5138180a9f87f4a974bef3322492c1d08ada..1f4d40d417d3a91056c275eda57538339bf7de96 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -681,11 +681,12 @@ sub srcfile ($;$) { #{{{
 sub add_underlay ($) { #{{{
        my $dir=shift;
 
-       if ($dir=~/^\//) {
-               unshift @{$config{underlaydirs}}, $dir;
+       if ($dir !~ /^\//) {
+               $dir="$config{underlaydir}/../$dir";
        }
-       else {
-               unshift @{$config{underlaydirs}}, "$config{underlaydir}/../$dir";
+
+       if (! grep { $_ eq $dir } @{$config{underlaydirs}}) {
+               unshift @{$config{underlaydirs}}, $dir;
        }
 
        return 1;
@@ -897,6 +898,12 @@ sub abs2rel ($$) { #{{{
 } #}}}
 
 sub displaytime ($;$) { #{{{
+       # Plugins can override this function to mark up the time for
+       # display.
+       return formattime(@_);
+} #}}}
+
+sub formattime ($;$) { #{{{
        my $time=shift;
        my $format=shift;
        if (! defined $format) {