(no commit message)

[git.ikiwiki.info.git] / IkiWiki / Plugin / bzr.pm

diff --git a/IkiWiki/Plugin/bzr.pm b/IkiWiki/Plugin/bzr.pm
index 72552abccaa96212c5f71d48cefcbb1b21e4498b..5ec254f84ff9af7a9a3cd69b73902923b43527bc 100644 (file)
--- 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) {
        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) {
        }
        elsif (defined $ipaddr) {

-               return "Anonymous from ".IkiWiki::possibly_foolish_untaint($ipaddr);
+               return "Anonymous from ".IkiWiki::possibly_foolish_untaint(IkiWiki::cloak($ipaddr));

        }
        else {
                return "Anonymous";
        }
        else {
                return "Anonymous";


@@ -195,7 +195,7 @@ sub rcs_add ($) {
 sub rcs_remove ($) {
        my ($file) = @_;
 
 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: $!";
        }
        if (system(@cmdline) != 0) {
                warn "'@cmdline' failed: $!";
        }


@@ -302,7 +302,7 @@ sub extract_timestamp (@) {
        open (my $out, "-|", @_);
        my @log = bzr_log($out);
 
        open (my $out, "-|", @_);
        my @log = bzr_log($out);
 

-       if (length @log < 1) {
+       if (length(scalar(@log)) < 1) {

                return 0;
        }
 
                return 0;
        }