X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/5466a1daf99e8e4c67a19f871aaf558312569652..00938c38f727d0763ca31eee0e48e77a243d289f:/IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 81a72d43d..ce9542f62 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -42,6 +42,7 @@ sub defaultconfig () { #{{{
 	adminuser => undef,
 	adminemail => undef,
 	plugin => [qw{inline htmlscrubber}],
+	timeformat => '%c',
 } #}}}
 	    
 sub checkconfig () { #{{{
@@ -260,8 +261,9 @@ sub styleurl (;$) { #{{{
 	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
@@ -269,10 +271,10 @@ sub htmllink ($$;$$$) { #{{{
 
 	my $bestlink;
 	if (! $forcesubpage) {
-		$bestlink=bestlink($page, $link);
+		$bestlink=bestlink($lpage, $link);
 	}
 	else {
-		$bestlink="$page/".lc($link);
+		$bestlink="$lpage/".lc($link);
 	}
 
 	$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
-	# 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=\"".
-			cgiurl(do => "create", page => $link, from =>$page).
+			cgiurl(do => "create", page => $link, from => $page).
 			"\">?</a>$linktext</span>"
 	}