summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-08-11 21:46:59 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-08-11 21:46:59 +0000
commitdc89360f03796465df96093b5a18a4abd661b4a3 (patch)
tree96a132e81fac5bae979eae9dd278a2ab1518d8fc
parent3ef2f4b529454dbb2a045686a763be7e3cd27801 (diff)
* The toc directive doesn't work well or make sense inside an inlined page.
Disable it when the page with the toc is nested inside another page.
-rw-r--r--IkiWiki/Plugin/toc.pm17
-rw-r--r--debian/changelog4
2 files changed, 15 insertions, 6 deletions
diff --git a/IkiWiki/Plugin/toc.pm b/IkiWiki/Plugin/toc.pm
index bc62f71d6..070c07b0e 100644
--- a/IkiWiki/Plugin/toc.pm
+++ b/IkiWiki/Plugin/toc.pm
@@ -17,13 +17,20 @@ my %tocpages;
sub preprocess (@) { #{{{
my %params=@_;
- $params{levels}=1 unless exists $params{levels};
+ if ($params{page} eq $params{destpage}) {
+ $params{levels}=1 unless exists $params{levels};
- # It's too early to generate the toc here, so just record the
- # info.
- $tocpages{$params{destpage}}=\%params;
+ # It's too early to generate the toc here, so just record the
+ # info.
+ $tocpages{$params{destpage}}=\%params;
- return "\n<div class=\"toc\"></div>\n";
+ return "\n<div class=\"toc\"></div>\n";
+ }
+ else {
+ # Don't generate toc in an inlined page, doesn't work
+ # right.
+ return "";
+ }
} # }}}
sub format (@) { #{{{
diff --git a/debian/changelog b/debian/changelog
index dbab896bd..f3afac013 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,8 +13,10 @@ ikiwiki (2.6) UNRELEASED; urgency=low
* Move blog form code out of CGI.pm and into the inline plugin.
* Updated Spanish translation from Victor Moral.
* Updated French translation from Cyril Brulebois. Closes: #437181
+ * The toc directive doesn't work well or make sense inside an inlined page.
+ Disable it when the page with the toc is nested inside another page.
- -- Joey Hess <joeyh@debian.org> Sat, 11 Aug 2007 17:24:46 -0400
+ -- Joey Hess <joeyh@debian.org> Sat, 11 Aug 2007 17:40:45 -0400
ikiwiki (2.5) unstable; urgency=low