Merge branch 'master' of git://github.com/joeyh/ikiwiki

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

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index c9cbb9cb7112f2384a1f5e30016ae592009f571c..ccfadfd699929a8be1764546118d89ee9f958f56 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -195,10 +195,10 @@ sub preprocess_inline (@) {
 
                @list = map { bestlink($params{page}, $_) }
                        split ' ', $params{pagenames};
 
                @list = map { bestlink($params{page}, $_) }
                        split ' ', $params{pagenames};

-
-               $params{pages} = join(" or ", @list);

        }
        else {
        }
        else {

+               add_depends($params{page}, $params{pages});
+

                @list = pagespec_match_list(
                        [ grep { $_ ne $params{page} } keys %pagesources ],
                        $params{pages}, location => $params{page});
                @list = pagespec_match_list(
                        [ grep { $_ ne $params{page} } keys %pagesources ],
                        $params{pages}, location => $params{page});


@@ -247,7 +247,6 @@ sub preprocess_inline (@) {
                @list=@list[0..$params{show} - 1];
        }
 
                @list=@list[0..$params{show} - 1];
        }
 

-       add_depends($params{page}, $params{pages});

        # Explicitly add all currently displayed pages as dependencies, so
        # that if they are removed or otherwise changed, the inline will be
        # sure to be updated.
        # Explicitly add all currently displayed pages as dependencies, so
        # that if they are removed or otherwise changed, the inline will be
        # sure to be updated.