X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/8a8e54f3f61721b40c60712c4c5c0cefd049502e..2e15a490067991448c3b65323ad9ecdc774dbfe4:/IkiWiki/Plugin/bzr.pm

diff --git a/IkiWiki/Plugin/bzr.pm b/IkiWiki/Plugin/bzr.pm
index 72552abcc..5ec254f84 100644
--- a/IkiWiki/Plugin/bzr.pm
+++ b/IkiWiki/Plugin/bzr.pm
@@ -133,10 +133,10 @@ sub bzr_author ($) {
 	my $ipaddr=$session->remote_addr();
 
 	if (defined $user) {
-		return IkiWiki::possibly_foolish_untaint($user);
+		return IkiWiki::possibly_foolish_untaint(IkiWiki::cloak($user));
 	}
 	elsif (defined $ipaddr) {
-		return "Anonymous from ".IkiWiki::possibly_foolish_untaint($ipaddr);
+		return "Anonymous from ".IkiWiki::possibly_foolish_untaint(IkiWiki::cloak($ipaddr));
 	}
 	else {
 		return "Anonymous";
@@ -195,7 +195,7 @@ sub rcs_add ($) {
 sub rcs_remove ($) {
 	my ($file) = @_;
 
-	my @cmdline = ("bzr", "rm", "--force", "--quiet", "$config{srcdir}/$file");
+	my @cmdline = ("bzr", "rm", "--quiet", "$config{srcdir}/$file");
 	if (system(@cmdline) != 0) {
 		warn "'@cmdline' failed: $!";
 	}
@@ -302,7 +302,7 @@ sub extract_timestamp (@) {
 	open (my $out, "-|", @_);
 	my @log = bzr_log($out);
 
-	if (length @log < 1) {
+	if (length(scalar(@log)) < 1) {
 		return 0;
 	}