diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-12-23 06:48:56 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-12-23 06:48:56 +0000 |
| commit | 201d11da0aad98ee497aa9866782547795d3369f (patch) | |
| tree | bb2a47ba883e5ffa9f85367f81a15294bb164176 | |
| parent | a0261089081ec71beea4cc5eb3eb4f243649520b (diff) | |
| download | ikiwiki-201d11da0aad98ee497aa9866782547795d3369f.tar ikiwiki-201d11da0aad98ee497aa9866782547795d3369f.tar.gz | |
the problem with coding while drunk -- idiotic mistakes
| -rw-r--r-- | IkiWiki.pm | 2 | ||||
| -rw-r--r-- | IkiWiki/Render.pm | 2 | ||||
| -rw-r--r-- | debian/changelog | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm index b8f3e7a55..18f9ab3fe 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -413,7 +413,7 @@ sub htmllink ($$$;$$$) { #{{{ $bestlink=htmlpage($bestlink); } if (! grep { $_ eq $bestlink } map { @{$_} } values %renderedfiles) { - return $linktext unless $config{cgi}; + return $linktext unless length $config{cgiurl}; return "<span><a href=\"". cgiurl(do => "create", page => lc($link), from => $page). "\">?</a>$linktext</span>" diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index 6d19a1dd3..863964207 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -93,7 +93,7 @@ sub genpage ($$$) { #{{{ $template->param(historyurl => $u); $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)); $actions++; } diff --git a/debian/changelog b/debian/changelog index d0fb28093..ce19d779c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,9 +3,9 @@ ikiwiki (1.37) UNRELEASED; urgency=low * Add mirrorlist plugin. * Fixed permissions of some files that were 600 in the tarball. (Did not 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 - 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 |