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

* Avoid creating edit links when not in cgi mode. 

* Avoid displaying discussion links at all, if there's not a discussion
  page, when not in cgi mode.
master
joey 2006-12-23 06:18:55 +00:00
parent be81a25cc5
commit 829e0b1b65
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
IkiWiki.pm
View File

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

2
IkiWiki/Render.pm
View File

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

5
debian/changelog vendored
View File

@ -3,8 +3,11 @@ 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 displaying discussion links at all, if there's not a discussion
page, when not in cgi mode.
-- Joey Hess <joeyh@debian.org> Sat, 23 Dec 2006 00:49:16 -0500
-- Joey Hess <joeyh@debian.org> Sat, 23 Dec 2006 01:17:54 -0500
ikiwiki (1.36) unstable; urgency=low

4
doc/bugs/__63__Discussion_when_not_CGI_mode.mdwn
View File

@ -4,4 +4,6 @@ But I did have a "?Discussion" link still and that is CGI.
So the bug (I think) is that it has a hyperlink to a CGI when CGI is not enabled.
(Note that my title above has _63_ but was supposed to be a question mark.)
> [[bugs/done]] -- [[Joey]]
(Note that my title above has _63_ but was supposed to be a question mark.)