urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

the problem with coding while drunk -- idiotic mistakes

master
joey 2006-12-23 06:48:56 +00:00
parent a026108908
commit 201d11da0a
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IkiWiki.pm
View File

@ -413,7 +413,7 @@ sub htmllink ($$$;$$$) { #{{{
$bestlink=htmlpage($bestlink); $bestlink=htmlpage($bestlink);
} }
if (! grep { $_ eq $bestlink } map { @{$_} } values %renderedfiles) { if (! grep { $_ eq $bestlink } map { @{$_} } values %renderedfiles) {
return $linktext unless $config{cgi}; return $linktext unless length $config{cgiurl};
return "<span><a href=\"". return "<span><a href=\"".
cgiurl(do => "create", page => lc($link), from => $page). cgiurl(do => "create", page => lc($link), from => $page).
"\">?</a>$linktext</span>" "\">?</a>$linktext</span>"

2
IkiWiki/Render.pm
View File

@ -93,7 +93,7 @@ sub genpage ($$$) { #{{{
$template->param(historyurl => $u); $template->param(historyurl => $u);
$actions++; $actions++;
} }
if ($config{discussion} && ($config{cgi} || exists $links{"$page/discussion"})) { if ($config{discussion} && (length $config{cgiurl} || exists $links{"$page/discussion"})) {
$template->param(discussionlink => htmllink($page, $page, "Discussion", 1, 1)); $template->param(discussionlink => htmllink($page, $page, "Discussion", 1, 1));
$actions++; $actions++;
} }

4
debian/changelog vendored
View File

@ -3,9 +3,9 @@ ikiwiki (1.37) UNRELEASED; urgency=low
* Add mirrorlist plugin. * Add mirrorlist plugin.
* Fixed permissions of some files that were 600 in the tarball. (Did not * Fixed permissions of some files that were 600 in the tarball. (Did not
affect the deb). affect the deb).
* Avoid creating edit links when not in cgi mode. * Avoid creating edit links when the cgi url is not known.
* Avoid displaying discussion links at all, if there's not a discussion * Avoid displaying discussion links at all, if there's not a discussion
page, when not in cgi mode. page, when the cgi url isn't known.
-- Joey Hess <joeyh@debian.org> Sat, 23 Dec 2006 01:17:54 -0500 -- Joey Hess <joeyh@debian.org> Sat, 23 Dec 2006 01:17:54 -0500