web commit by http://adam.shand.net/

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

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index d0cfbf873c93d45c74684d221d96b324fc739f3d..3c029e001f78a208840b26aa814df1a742a7b5ca 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::inline;
 
 use warnings;
 use strict;
-use IkiWiki 1.00;
+use IkiWiki 2.00;
 use URI;
 
 sub import { #{{{
@@ -88,7 +88,7 @@ sub preprocess_inline (@) { #{{{
        my @list;
        foreach my $page (keys %pagesources) {
                next if $page eq $params{page};
-               if (pagespec_match($page, $params{pages}, $params{page})) {
+               if (pagespec_match($page, $params{pages}, location => $params{page})) {
                        push @list, $page;
                }
        }
@@ -137,6 +137,14 @@ sub preprocess_inline (@) { #{{{
                        exists $params{rootpage} ? $params{rootpage} : $params{page});
                $formtemplate->param(rssurl => $rssurl) if $feeds && $rss;
                $formtemplate->param(atomurl => $atomurl) if $feeds && $atom;
+               if (exists $params{postformtext}) {
+                       $formtemplate->param(postformtext =>
+                               $params{postformtext});
+               }
+               else {
+                       $formtemplate->param(postformtext =>
+                               gettext("Add a new post titled:"));
+               }
                $ret.=$formtemplate->output;
        }
        elsif ($feeds) {
@@ -214,6 +222,9 @@ sub preprocess_inline (@) { #{{{
                if (exists $params{feedshow} && @list > $params{feedshow}) {
                        @list=@list[0..$params{feedshow} - 1];
                }
+               if (exists $params{feedpages}) {
+                       @list=grep { pagespec_match($_, $params{feedpages}, location => $params{page}) } @list;
+               }
        
                if ($rss) {
                        my $rssp=rsspage($params{page});
@@ -312,14 +323,13 @@ sub genfeed ($$$$@) { #{{{
        my $page=shift;
        my @pages=@_;
        
-       my $url=URI->new(encode_utf8($config{url}."/".htmlpage($page)));
+       my $url=URI->new(encode_utf8($config{url}."/".urlto($page,"")));
        
        my $itemtemplate=template($feedtype."item.tmpl", blind_cache => 1);
        my $content="";
        my $lasttime = 0;
        foreach my $p (@pages) {
-               my $u=URI->new(encode_utf8($config{url}."/".htmlpage($p)));
-               
+               my $u=URI->new(encode_utf8($config{url}."/".urlto($p, "")));
                my $pcontent = absolute_urls(get_inline_content($p, $page), $url);
 
                $itemtemplate->param(
@@ -407,7 +417,7 @@ sub pingurl (@) { #{{{
 
        foreach my $page (keys %toping) {
                my $title=pagetitle(basename($page), 0);
-               my $url="$config{url}/".htmlpage($page);
+               my $url="$config{url}/".urlto($page, "");
                foreach my $pingurl (@{$config{pingurl}}) {
                        debug("Pinging $pingurl for $page");
                        eval {