the problem with coding while drunk -- idiotic mistakes

diff --git a/IkiWiki.pm b/IkiWiki.pm
index b8f3e7a55dcefb0c39aba10f5b2773d7beafadbb..18f9ab3fed2c0053b149b3d95ae603363fc47362 100644 (file)
--- 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 6d19a1dd307d85bef13eff457651e5d95e0bca41..86396420736a8e7120815da60b579e9781b8b0cb 100644 (file)
--- 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 d0fb28093668ca896046276009cfe02b659d158f..ce19d779c40e911626065c21f5c3354b0e871c96 100644 (file)
--- 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