function injection overhaul

[ikiwiki.git] / IkiWiki / Plugin / external.pm

diff --git a/IkiWiki/Plugin/external.pm b/IkiWiki/Plugin/external.pm
index 287e118f143b3474d5b3fb6d96b9df14504ffb23..4ce9c8babb62d45bacb3bb76a4773bd27cb09b5c 100644 (file)
--- a/IkiWiki/Plugin/external.pm
+++ b/IkiWiki/Plugin/external.pm
@@ -202,10 +202,16 @@ sub inject ($@) { #{{{
        my $sub = sub {
                IkiWiki::Plugin::external::rpc_call($plugin, $params{call}, @_)
        };
        my $sub = sub {
                IkiWiki::Plugin::external::rpc_call($plugin, $params{call}, @_)
        };

+       $sub=memoize($sub) if $params{memoize};
+
+       # This will add it to the symbol table even if not present.

        no warnings;
        eval qq{*$params{name}=\$sub};
        use warnings;
        no warnings;
        eval qq{*$params{name}=\$sub};
        use warnings;

-       memoize($params{name}) if $params{memoize};
+
+       # This will ensure that everywhere it was exported to sees
+       # the injected version.
+       IkiWiki::inject(name => $params{name}, call => $sub);

        return 1;
 } #}}}
 
        return 1;
 } #}}}