From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 6 Aug 2008 05:05:44 +0000 (-0400)
Subject: external: Fix support for hooks called in an array context.
X-Git-Tag: 2.60~34
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=86660e9c82b67f9165cb5fabe28c341a338d8c4e;p=ikiwiki.git

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

diff --git a/IkiWiki/Plugin/external.pm b/IkiWiki/Plugin/external.pm
index ff3b2d8ed..ba6c7d8b9 100644
--- 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 b8fcf619e..b4bdfeefe 100644
--- 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