note

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

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 4410a20176dd237dd830ebed769e747c4c5a3abb..5c2aeb6c7ccecde1ec6df7c0a32ec3986cdbe2de 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -5,7 +5,7 @@ package IkiWiki::Plugin::inline;
 use warnings;
 use strict;
 use IkiWiki;
 use warnings;
 use strict;
 use IkiWiki;

-use HTML::Entities q{encode_entities_numeric};
+use URI;

 
 sub import { #{{{
        IkiWiki::hook(type => "preprocess", id => "inline", 
 
 sub import { #{{{
        IkiWiki::hook(type => "preprocess", id => "inline", 


@@ -93,8 +93,11 @@ sub preprocess_inline (@) { #{{{
                $link=abs2rel($link, dirname($params{page}));
                $template->param(pageurl => $link);
                $template->param(title => pagetitle(basename($page)));
                $link=abs2rel($link, dirname($params{page}));
                $template->param(pageurl => $link);
                $template->param(title => pagetitle(basename($page)));

-               $template->param(content => get_inline_content($page, $params{page}))
-                       if $params{archive} eq "no";
+               # TODO: if $params{archive} eq "no", the only reason to do this
+               # is to let the meta plugin get page title info; so stop
+               # calling this next line then once the meta plugin can
+               # store that accross runs (also tags plugin).
+               $template->param(content => get_inline_content($page, $params{page}));

                $template->param(ctime => displaytime($pagectime{$page}));
 
                run_hooks(pagetemplate => sub {
                $template->param(ctime => displaytime($pagectime{$page}));
 
                run_hooks(pagetemplate => sub {


@@ -127,7 +130,11 @@ sub get_inline_content ($$) { #{{{
        my $file=$pagesources{$page};
        my $type=pagetype($file);
        if (defined $type) {
        my $file=$pagesources{$page};
        my $type=pagetype($file);
        if (defined $type) {

-               return htmlize($type, preprocess($page, $destpage, linkify($page, $destpage, readfile(srcfile($file)))));
+               return htmlize($type,
+                      preprocess($page, $destpage,
+                      linkify($page, $destpage,
+                      filter($page,
+                      readfile(srcfile($file))))));

        }
        else {
                return "";
        }
        else {
                return "";


@@ -138,7 +145,11 @@ sub date_822 ($) { #{{{
        my $time=shift;
 
        eval q{use POSIX};
        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 ($$) { #{{{
 } #}}}
 
 sub absolute_urls ($$) { #{{{


@@ -163,15 +174,14 @@ sub genrss ($@) { #{{{
        my $page=shift;
        my @pages=@_;
        
        my $page=shift;
        my @pages=@_;
        

-       my $url=encode_entities_numeric("$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);
+       my $itemtemplate=template("rssitem.tmpl", blind_cache => 1);

        my $content="";
        foreach my $p (@pages) {
                next unless exists $renderedfiles{$p};
 
        my $content="";
        foreach my $p (@pages) {
                next unless exists $renderedfiles{$p};
 

-               my $u=encode_entities_numeric("$config{url}/$renderedfiles{$p}");
+               my $u=URI->new(encode_utf8("$config{url}/$renderedfiles{$p}"));

 
                $itemtemplate->param(
                        title => pagetitle(basename($p)),
 
                $itemtemplate->param(
                        title => pagetitle(basename($p)),


@@ -227,7 +237,7 @@ sub pingurl (@) { #{{{
                        }
                        my $r=$res->value;
                        if (! exists $r->{flerror} || $r->{flerror}) {
                        }
                        my $r=$res->value;
                        if (! exists $r->{flerror} || $r->{flerror}) {

-                               debug("Ping rejected: ".$r->{message});
+                               debug("Ping rejected: ".(exists $r->{message} ? $r->{message} : "[unknown reason]"));

                        }
                }
        }
                        }
                }
        }