aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-02-24 15:36:25 -0500
committerJoey Hess <joey@kodama.kitenet.net>2008-02-24 15:36:25 -0500
commitf7303db5a194bff0e0c621efedc320cf9997d35e (patch)
treec592e8abe64f89f4ff6d21ee0f475e793d4b32e5
parent023e3c47a4276bbb65aa88600778dd5a183c2e71 (diff)
downloadikiwiki-f7303db5a194bff0e0c621efedc320cf9997d35e.tar
ikiwiki-f7303db5a194bff0e0c621efedc320cf9997d35e.tar.gz
* Fix another preview will_render bug. This one involved inline,
which forced a scan of the page to make available metadata that appeared after the inline directive. Problem is that scan made it forget about any other files rendered due to the page. The scan also turns out to be unnecessary now, since meta persistently stores state and it's always available. So it was just removed.
-rw-r--r--IkiWiki/Plugin/inline.pm5
-rw-r--r--debian/changelog6
2 files changed, 6 insertions, 5 deletions
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index b40303078..b43530eb8 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -153,11 +153,6 @@ sub preprocess_inline (@) { #{{{
# that if they are removed or otherwise changed, the inline will be
# sure to be updated.
add_depends($params{page}, join(" or ", @list));
- # Force a scan of this page so any metadata that appears after this
- # inline directive is available when inlining. The page normally
- # wouldn't be scanned if it's only being rebuilt because of a
- # depedency.
- IkiWiki::scan($pagesources{$params{page}});
my $feednum="";
diff --git a/debian/changelog b/debian/changelog
index fb6b8e8a0..cd66d3c5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,6 +38,12 @@ ikiwiki (2.40) UNRELEASED; urgency=low
* tla: Remove call to escapeHTML when constructing recentchanges message;
the html is escaped at a different level. Closes: #466495
* bzr, mercurial: Remove unused import of escapeHTML.
+ * Fix another preview will_render bug. This one involved inline,
+ which forced a scan of the page to make available metadata that
+ appeared after the inline directive. Problem is that scan made it forget
+ about any other files rendered due to the page. The scan also turns out
+ to be unnecessary now, since meta persistently stores state and it's
+ always available. So it was just removed.
-- Josh Triplett <josh@freedesktop.org> Sun, 10 Feb 2008 13:18:58 -0800