X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/ba480baa9ec9e2d5d04c6eb06fd3ab4dafd60794..502a3433c410369eca4eb36b8fb8be5bc4a34a2d:/IkiWiki/Plugin/external.pm?ds=inline

diff --git a/IkiWiki/Plugin/external.pm b/IkiWiki/Plugin/external.pm
index 300dee7ed..4ce9c8bab 100644
--- a/IkiWiki/Plugin/external.pm
+++ b/IkiWiki/Plugin/external.pm
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 # Support for external plugins written in other languages.
-# Communication via XML RPC a pipe.
+# Communication via XML RPC to a pipe.
 # See externaldemo for an example of a plugin that uses this.
 package IkiWiki::Plugin::external;
 
@@ -68,7 +68,22 @@ sub rpc_call ($$;@) { #{{{
 					return @{$value->value};
 				}
 				elsif ($value->isa('RPC::XML::struct')) {
-					return %{$value->value};
+					my %hash=%{$value->value};
+
+					# XML-RPC v1 does not allow for
+					# nil/null/None/undef values to be
+					# transmitted, so until
+					# XML::RPC::Parser honours v2
+					# (<nil/>), external plugins send
+					# a hash with one key "null" pointing
+					# to an empty string.
+					if (exists $hash{null} &&
+					    $hash{null} eq "" &&
+					    int(keys(%hash)) == 1) {
+						return undef;
+					}
+
+					return %hash;
 				}
 				else {
 					return $value->value;
@@ -92,6 +107,14 @@ sub rpc_call ($$;@) { #{{{
 				error("XML RPC call error, unknown function: $name");
 			}
 
+			# XML-RPC v1 does not allow for nil/null/None/undef
+			# values to be transmitted, so until XML::RPC::Parser
+			# honours v2 (<nil/>), send a hash with one key "null"
+			# pointing to an empty string.
+			if (! defined $ret) {
+				$ret={"null" => ""};
+			}
+
 			my $string=eval { RPC::XML::response->new($ret)->as_string };
 			if ($@ && ref $ret) {
 				# One common reason for serialisation to
@@ -128,9 +151,10 @@ sub setvar ($$$;@) { #{{{
 	my $plugin=shift;
 	my $varname="IkiWiki::".shift;
 	my $key=shift;
+	my $value=shift;
 
 	no strict 'refs';
-	my $ret=$varname->{$key}=@_;
+	my $ret=$varname->{$key}=$value;
 	use strict 'refs';
 	return $ret;
 } #}}}
@@ -149,20 +173,22 @@ sub setstate ($$$$;@) { #{{{
 	my $page=shift;
 	my $id=shift;
 	my $key=shift;
+	my $value=shift;
 
-	return $IkiWiki::pagestate{$page}{$id}{$key}=@_;
+	return $IkiWiki::pagestate{$page}{$id}{$key}=$value;
 } #}}}
 
 sub getargv ($) { #{{{
 	my $plugin=shift;
 
-	return @ARGV;
+	return \@ARGV;
 } #}}}
 
 sub setargv ($@) { #{{{
 	my $plugin=shift;
+	my $array=shift;
 
-	@ARGV=@_;
+	@ARGV=@$array;
 } #}}}
 
 sub inject ($@) { #{{{
@@ -176,8 +202,16 @@ sub inject ($@) { #{{{
 	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};
-	memoize($params{name}) if $params{memoize};
+	use warnings;
+
+	# This will ensure that everywhere it was exported to sees
+	# the injected version.
+	IkiWiki::inject(name => $params{name}, call => $sub);
 	return 1;
 } #}}}
 
@@ -191,8 +225,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, @_);
 	});
 } #}}}