Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 0fe0bd2e108a444b6b85c2ded93840f10e4fd2fc..553fd350c15dd173305d52da5e9b9c2e85be332a 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -337,7 +337,8 @@ sub preprocess_inline (@) {
                        my $file = $pagesources{$page};
                        my $type = pagetype($file);
                        if (! $raw || ($raw && ! defined $type)) {
-                               unless ($archive && $quick) {
+                               if (!($archive && $quick) &&
+                                   $template->query(name => 'content')) {
                                        # Get the content before populating the
                                        # template, since getting the content uses
                                        # the same template if inlines are nested.

diff --git a/debian/changelog b/debian/changelog
index ef92e48fcc0d7a29b4e7c59938f2525e26964553..eab725d92a1a65f352a5766d15236a16c8af8310 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,6 +37,8 @@ ikiwiki (3.2009XXXX) UNRELEASED; urgency=low
   * calendar: Fix CSS for year calendar to match the plugin documentation.
   * Added minimal default CSS for calendar plugin, just highlighting the
     current day.
+  * inline: Optimize generation of archives, etc by not getting inlined page
+    content if the template does not use it.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 09 Oct 2009 19:53:50 -0400