external: Fix support for hooks called in an array context.

diff --git a/IkiWiki/Plugin/external.pm b/IkiWiki/Plugin/external.pm
index ff3b2d8ed97d06c53402cb04b8921b3761136673..ba6c7d8b9f064577bcfb2c9e2716c7653da1fc72 100644 (file)
--- a/IkiWiki/Plugin/external.pm
+++ b/IkiWiki/Plugin/external.pm
@@ -217,8 +217,7 @@ sub hook ($@) { #{{{
        delete $params{call};
 
        IkiWiki::hook(%params, call => sub {
-               my $ret=IkiWiki::Plugin::external::rpc_call($plugin, $callback, @_);
-               return $ret;
+               IkiWiki::Plugin::external::rpc_call($plugin, $callback, @_);
        });
 } #}}}
 

diff --git a/debian/changelog b/debian/changelog
index b8fcf619e7c25f13edfe330a13f0e06dfc7670b7..b4bdfeefeb1a3b7603675ca74199b87a9bc80276 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,7 @@ ikiwiki (2.60) UNRELEASED; urgency=low
   * autoindex: Ignore internal pages, and take underlay directories into
     account. Also, avoid making index pages for directories that contain
     no files.
+  * external: Fix support for hooks called in an array context.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 21 Jul 2008 11:35:46 -0400