* Fix dates in rss feeds if running localised, so they're still rfc 822.

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

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 6a0f00f0fd7a39b760d70e003b12eabad0d5ca6a..56adaf509574e214bc01bb93c5859125fa165de1 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -5,6 +5,7 @@ package IkiWiki::Plugin::inline;
 use warnings;
 use strict;
 use IkiWiki;
+use URI;
 
 sub import { #{{{
        IkiWiki::hook(type => "preprocess", id => "inline", 
@@ -48,7 +49,7 @@ sub preprocess_inline (@) { #{{{
        my @list;
        foreach my $page (keys %pagesources) {
                next if $page eq $params{page};
-               if (globlist_match($page, $params{pages})) {
+               if (pagespec_match($page, $params{pages})) {
                        push @list, $page;
                }
        }
@@ -137,7 +138,11 @@ sub date_822 ($) { #{{{
        my $time=shift;
 
        eval q{use POSIX};
-       return POSIX::strftime("%a, %d %b %Y %H:%M:%S %z", localtime($time));
+       my $lc_time= POSIX::setlocale(&POSIX::LC_TIME);
+       POSIX::setlocale(&POSIX::LC_TIME, "C");
+       my $ret=POSIX::strftime("%a, %d %b %Y %H:%M:%S %z", localtime($time));
+       POSIX::setlocale(&POSIX::LC_TIME, $lc_time);
+       return $ret;
 } #}}}
 
 sub absolute_urls ($$) { #{{{
@@ -162,7 +167,7 @@ sub genrss ($@) { #{{{
        my $page=shift;
        my @pages=@_;
        
-       my $url="$config{url}/".htmlpage($page);
+       my $url=URI->new(encode_utf8("$config{url}/".htmlpage($page)));
        
        my $itemtemplate=template("rssitem.tmpl", blind_cache => 1, 
                die_on_bad_params => 0);
@@ -170,9 +175,12 @@ sub genrss ($@) { #{{{
        foreach my $p (@pages) {
                next unless exists $renderedfiles{$p};
 
+               my $u=URI->new(encode_utf8("$config{url}/$renderedfiles{$p}"));
+
                $itemtemplate->param(
                        title => pagetitle(basename($p)),
-                       url => "$config{url}/$renderedfiles{$p}",
+                       url => $u,
+                       permalink => $u,
                        pubdate => date_822($pagectime{$p}),
                        content => absolute_urls(get_inline_content($p, $page), $url),
                );
@@ -180,6 +188,7 @@ sub genrss ($@) { #{{{
                        shift->(page => $p, destpage => $page,
                                template => $itemtemplate);
                });
+
                $content.=$itemtemplate->output;
                $itemtemplate->clear_params;
        }
@@ -191,7 +200,6 @@ sub genrss ($@) { #{{{
                pageurl => $url,
                content => $content,
        );
-       
        run_hooks(pagetemplate => sub {
                shift->(page => $page, destpage => $page,
                        template => $template);