diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2009-08-28 15:10:37 -0400 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2009-08-28 15:10:37 -0400 |
| commit | 59ad31c24220f16c6aa52d187ecca215c914831c (patch) | |
| tree | 63bef0d50a054d442c0d5445f93485b51b5d43ff /IkiWiki/Plugin | |
| parent | 4236eb5f688944d70c19427e1150285238ce61ce (diff) | |
| parent | 54b3d55aadf9c6ee2b4b3aa68b3a1794a9394fd4 (diff) | |
Merge commit 'smcv/ready/depends-exact'
Diffstat (limited to 'IkiWiki/Plugin')
| -rw-r--r-- | IkiWiki/Plugin/inline.pm | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index a501566b5..d5ad11d43 100644 --- 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}; - - $params{pages} = join(" or ", @list); } else { + add_depends($params{page}, $params{pages}); + @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]; } - 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. |