stop using REMOTE_ADDR

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

diff --git a/IkiWiki/Plugin/darcs.pm b/IkiWiki/Plugin/darcs.pm
index c1d6661d3a503840c419be55dadff6d16fdf6d03..345456c01d01d6a6b66bc72640c68ded0940d633 100644 (file)
--- a/IkiWiki/Plugin/darcs.pm
+++ b/IkiWiki/Plugin/darcs.pm
@@ -63,7 +63,7 @@ sub file_in_vc ($$) {
        }
        my $found=0;
        while (<DARCS_MANIFEST>) {
        }
        my $found=0;
        while (<DARCS_MANIFEST>) {

-               $found = 1, last if /^(\.\/)?$file$/;
+               $found = 1 if /^(\.\/)?$file$/;

        }
        close(DARCS_MANIFEST) or error("'darcs query manifest' exited " . $?);
 
        }
        close(DARCS_MANIFEST) or error("'darcs query manifest' exited " . $?);
 


@@ -140,11 +140,11 @@ sub rcs_prepedit ($) {
        return $rev;
 }
 
        return $rev;
 }
 

-sub rcs_commit ($$$;$$) {
+sub rcs_commit ($$$;$$$) {

        # Commit the page.  Returns 'undef' on success and a version of the page
        # with conflict markers on failure.
 
        # Commit the page.  Returns 'undef' on success and a version of the page
        # with conflict markers on failure.
 

-       my ($file, $message, $rcstoken, $user, $ipaddr) = @_;
+       my ($file, $message, $rcstoken, $user, $ipaddr, $emailuser) = @_;

 
        # Compute if the "revision" of $file changed.
        my $changed = darcs_rev($file) ne $rcstoken;
 
        # Compute if the "revision" of $file changed.
        my $changed = darcs_rev($file) ne $rcstoken;


@@ -239,8 +239,8 @@ sub rcs_commit ($$$;$$) {
        }
 }
 
        }
 }
 

-sub rcs_commit_staged ($$$) {
-       my ($message, $user, $ipaddr) = @_;
+sub rcs_commit_staged ($$$;$) {
+       my ($message, $user, $ipaddr, $emailuser) = @_;

 
        my $author;
        if (defined $user) {
 
        my $author;
        if (defined $user) {