Merge branch 'master' into dependency-types

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

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 748e02df418370e10200e32428b649c5d86e75e6..0fe0bd2e108a444b6b85c2ded93840f10e4fd2fc 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -216,9 +216,9 @@ sub preprocess_inline (@) {
                        $num+=$params{skip};
                }
 
                        $num+=$params{skip};
                }
 

-               @list = use_pagespec($params{page}, $params{pages},
+               @list = pagespec_match_list($params{page}, $params{pages},

                        deptype => deptype($quick ? "presence" : "content"),
                        deptype => deptype($quick ? "presence" : "content"),

-                       limit => sub { $_[0] ne $params{page} },
+                       filter => sub { $_[0] eq $params{page} },

                        sort => exists $params{sort} ? $params{sort} : "age",
                        reverse => yesno($params{reverse}),
                        num => $num,
                        sort => exists $params{sort} ? $params{sort} : "age",
                        reverse => yesno($params{reverse}),
                        num => $num,


@@ -245,8 +245,11 @@ sub preprocess_inline (@) {
        }
 
        if ($feeds && exists $params{feedpages}) {
        }
 
        if ($feeds && exists $params{feedpages}) {

-               @feedlist = use_pagespec($params{page}, $params{feedpages},
-                       list => \@feedlist);
+               @feedlist = pagespec_match_list(
+                       $params{page}, "($params{pages}) and ($params{feedpages})",
+                       deptype => deptype($quick ? "presence" : "content"),
+                       list => \@feedlist,
+               );

        }
 
        my ($feedbase, $feednum);
        }
 
        my ($feedbase, $feednum);