From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Sat, 23 Dec 2006 06:48:56 +0000 (+0000)
Subject: the problem with coding while drunk -- idiotic mistakes
X-Git-Tag: 1.37~113
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=201d11da0aad98ee497aa9866782547795d3369f;p=ikiwiki.git

the problem with coding while drunk -- idiotic mistakes
---

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