external: Fix pagespec_match and pagespec_match_list. Closes: #527281

diff --git a/IkiWiki/Plugin/external.pm b/IkiWiki/Plugin/external.pm
index f0acc7e4e1b52a5787ca00b139a21eef0be7c4f5..57a72eb685e4ea2a6be982102fa21e78fb0c2367 100644 (file)
--- 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 62e1543b3bb28c0f5200814c2b6f6b76453927d1..7daa350d95b77935bc6607fd79fd0257baeb035e 100644 (file)
--- 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 1e1d48d784f9a9c1a146a6bc7fec42062b548a1b..d4fe91b8899183c1fd139ffa464b8a0404f1e893 100644 (file)
--- 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