diff options
| -rw-r--r-- | IkiWiki/Plugin/external.pm | 10 | ||||
| -rw-r--r-- | debian/NEWS | 2 | ||||
| -rw-r--r-- | debian/changelog | 6 |
3 files changed, 13 insertions, 5 deletions
diff --git a/IkiWiki/Plugin/external.pm b/IkiWiki/Plugin/external.pm index f0acc7e4e..57a72eb68 100644 --- a/IkiWiki/Plugin/external.pm +++ b/IkiWiki/Plugin/external.pm @@ -232,15 +232,21 @@ sub hook ($@) { sub pagespec_match ($@) { # convert return object into a XML RPC boolean my $plugin=shift; + my $page=shift; + my $spec=shift; - return RPC::XML::boolean->new(0 + IkiWiki::pagespec_match(@_)); + return RPC::XML::boolean->new(0 + IkiWiki::pagespec_match( + $page, $spec, @_)); } sub pagespec_match_list ($@) { # convert return object into a XML RPC boolean my $plugin=shift; + my $pages=shift; + my $spec=shift; - return RPC::XML::boolean->new(0 + IkiWiki::pagespec_match_list(@_)); + return RPC::XML::boolean->new(0 + IkiWiki::pagespec_match_list( + $pages, $spec, @_)); } 1 diff --git a/debian/NEWS b/debian/NEWS index 62e1543b3..7daa350d9 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,4 +1,4 @@ -ikiwiki (3.12) UNRELEASED; urgency=low +ikiwiki (3.12) unstable; urgency=low You may want to run `ikiwiki-transition deduplinks /path/to/srcdir` after upgrading to this version of ikiwiki. This command will diff --git a/debian/changelog b/debian/changelog index 1e1d48d78..d4fe91b88 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.12) UNRELEASED; urgency=low +ikiwiki (3.12) unstable; urgency=low * Re-enable python-support and add python:Depends to control file. * ikiwiki-makerepo: Avoid using abs_path, as it apparently @@ -9,8 +9,10 @@ ikiwiki (3.12) UNRELEASED; urgency=low modifying %links directly, to avoid it accumulating duplicates. * ikiwiki-transition: Add a deduplinks action, that can be used to remove duplicate links and optimise a wiki w/o rebuilding it. + * external: Fix pagespec_match and pagespec_match_list. + Closes: #527281 - -- Joey Hess <joeyh@debian.org> Mon, 04 May 2009 19:17:39 -0400 + -- Joey Hess <joeyh@debian.org> Wed, 06 May 2009 00:31:16 -0400 ikiwiki (3.11) unstable; urgency=low |