meta: Allow use of DESCRIPTION in templates to get at the meta description value...

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 45d073e2881cfd544d676fea15bb9d2e5e13baf5..55c9ddbd1482f8d47007c4e1b66cf2ea6d2f2332 100644 (file)
--- 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 9bddf0733366d60653749d0a0e6ba09da4fdfc77..1abd4de4dc4c8244049442d83c5762657f62ea52 100644 (file)
--- 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