web commit by joey

[ikiwiki.git] / IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 81a72d43d2e25a55984c39362eb87671db75b0e4..ce9542f628ecbc055ecd331742e438ef3e6f56e9 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -42,6 +42,7 @@ sub defaultconfig () { #{{{
        adminuser => undef,
        adminemail => undef,
        plugin => [qw{inline htmlscrubber}],
        adminuser => undef,
        adminemail => undef,
        plugin => [qw{inline htmlscrubber}],

+       timeformat => '%c',

 } #}}}
            
 sub checkconfig () { #{{{
 } #}}}
            
 sub checkconfig () { #{{{


@@ -260,8 +261,9 @@ sub styleurl (;$) { #{{{
        return $page."style.css";
 } #}}}
 
        return $page."style.css";
 } #}}}
 

-sub htmllink ($$;$$$) { #{{{
-       my $page=shift;
+sub htmllink ($$$;$$$) { #{{{
+       my $lpage=shift; # the page doing the linking
+       my $page=shift; # the page that will contain the link (different for inline)

        my $link=shift;
        my $noimageinline=shift; # don't turn links into inline html images
        my $forcesubpage=shift; # force a link to a subpage
        my $link=shift;
        my $noimageinline=shift; # don't turn links into inline html images
        my $forcesubpage=shift; # force a link to a subpage


@@ -269,10 +271,10 @@ sub htmllink ($$;$$$) { #{{{
 
        my $bestlink;
        if (! $forcesubpage) {
 
        my $bestlink;
        if (! $forcesubpage) {

-               $bestlink=bestlink($page, $link);
+               $bestlink=bestlink($lpage, $link);

        }
        else {
        }
        else {

-               $bestlink="$page/".lc($link);
+               $bestlink="$lpage/".lc($link);

        }
 
        $linktext=pagetitle(basename($link)) unless defined $linktext;
        }
 
        $linktext=pagetitle(basename($link)) unless defined $linktext;


@@ -281,14 +283,13 @@ sub htmllink ($$;$$$) { #{{{
        
        # TODO BUG: %renderedfiles may not have it, if the linked to page
        # was also added and isn't yet rendered! Note that this bug is
        
        # TODO BUG: %renderedfiles may not have it, if the linked to page
        # was also added and isn't yet rendered! Note that this bug is

-       # masked by the bug mentioned below that makes all new files
-       # be rendered twice.
+       # masked by the bug that makes all new files be rendered twice.

        if (! grep { $_ eq $bestlink } values %renderedfiles) {
                $bestlink=htmlpage($bestlink);
        }
        if (! grep { $_ eq $bestlink } values %renderedfiles) {
                return "<span><a href=\"".
        if (! grep { $_ eq $bestlink } values %renderedfiles) {
                $bestlink=htmlpage($bestlink);
        }
        if (! grep { $_ eq $bestlink } values %renderedfiles) {
                return "<span><a href=\"".

-                       cgiurl(do => "create", page => $link, from =>$page).
+                       cgiurl(do => "create", page => $link, from => $page).

                        "\">?</a>$linktext</span>"
        }
        
                        "\">?</a>$linktext</span>"
        }