aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--IkiWiki/Plugin/meta.pm2
-rw-r--r--debian/changelog2
2 files changed, 3 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 45d073e28..55c9ddbd1 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -267,7 +267,7 @@ sub pagetemplate (@) {
$template->param(title_overridden => 1);
}
- foreach my $field (qw{author authorurl permalink}) {
+ foreach my $field (qw{author authorurl description permalink}) {
$template->param($field => $pagestate{$page}{meta}{$field})
if exists $pagestate{$page}{meta}{$field} && $template->query(name => $field);
}
diff --git a/debian/changelog b/debian/changelog
index 9bddf0733..1abd4de4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ ikiwiki (3.20091114) UNRELEASED; urgency=low
* meta: Generate meta description tags even when the html scrubber is
enabled.
+ * meta: Allow use of DESCRIPTION in templates to get at the meta description
+ value. (Thanks, NicolasLimare)
-- Joey Hess <joeyh@debian.org> Mon, 16 Nov 2009 15:46:45 -0500