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

(cherry picked from commit 86660e9c82b67f9165cb5fabe28c341a338d8c4e)

diff --git a/IkiWiki/Plugin/external.pm b/IkiWiki/Plugin/external.pm
index 204442c1e0b731db6d985cef61181e0c7b0fc424..1abf0d4a53144a4243910b901600e0e33948f8c2 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 b1d55cfdbc495b25d4244bfcf78d1fe54b75c566..4a998d8b87d2f11949c6c17e40e1e64607b9b533 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ ikiwiki (2.53.1) UNRELEASED; urgency=low
   * toggle: Fix incompatability between javascript and webkit.
   * toggle: Fix for when html got tidied. Closes: #492529 (Enrico Zini)
   * inline: Ignore parent dirs when sorting pages by title.
+  * external: Fix support for hooks called in an array context.
 
  -- Josh Triplett <josh@freedesktop.org>  Wed, 09 Jul 2008 21:30:33 -0700