comments: add regression test for sorting by date

[git.ikiwiki.info.git] / IkiWiki / Plugin / meta.pm

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index cd6fa20bab87e3d74a0480e4eefaee08bbd74e2b..e9736584c5836fb9c4a077819ca6b939fd248aa9 100644 (file)
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -217,6 +217,13 @@ sub preprocess (@) {
                                'content="'.encode_entities($url).'" />';
                }
        }
                                'content="'.encode_entities($url).'" />';
                }
        }

+       elsif ($key eq 'foaf') {
+               if (safeurl($value)) {
+                       push @{$metaheaders{$page}}, '<link rel="meta" '.
+                               'type="application/rdf+xml" title="FOAF" '.
+                               'href="'.encode_entities($value).'" />';
+               }
+       }

        elsif ($key eq 'redir') {
                return "" if $page ne $destpage;
                my $safe=0;
        elsif ($key eq 'redir') {
                return "" if $page ne $destpage;
                my $safe=0;


@@ -301,7 +308,7 @@ sub pagetemplate (@) {
        }
        if (exists $pagestate{$page}{meta}{title} && $template->query(name => "title")) {
                eval q{use HTML::Entities};
        }
        if (exists $pagestate{$page}{meta}{title} && $template->query(name => "title")) {
                eval q{use HTML::Entities};

-               $template->param(title => encode_numeric($pagestate{$page}{meta}{title}));
+               $template->param(title => HTML::Entities::encode_numeric($pagestate{$page}{meta}{title}));

                $template->param(title_overridden => 1);
        }
 
                $template->param(title_overridden => 1);
        }
 


@@ -317,7 +324,7 @@ sub pagetemplate (@) {
 
        foreach my $field (qw{description}) {
                eval q{use HTML::Entities};
 
        foreach my $field (qw{description}) {
                eval q{use HTML::Entities};

-               $template->param($field => encode_numeric($pagestate{$page}{meta}{$field}))
+               $template->param($field => HTML::Entities::encode_numeric($pagestate{$page}{meta}{$field}))

                        if exists $pagestate{$page}{meta}{$field} && $template->query(name => $field);
        }
 
                        if exists $pagestate{$page}{meta}{$field} && $template->query(name => $field);
        }