Merge branch 'master' into revert

[git.ikiwiki.info.git] / IkiWiki / Receive.pm

diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm
index 48228e5f06075088e7e01fd7fd40b8cd2426c611..88fb4972571e7013480f943483a73a11e5b9a93d 100644 (file)
--- a/IkiWiki/Receive.pm
+++ b/IkiWiki/Receive.pm
@@ -73,18 +73,18 @@ sub test () {
                }) || error("failed adding user");
        }
 
                }) || error("failed adding user");
        }
 

-        test_changes(cgi => $cgi,
-                     session => $session,
-                     changes => [IkiWiki::rcs_receive()]
-                    );
+       test_changes(cgi => $cgi,
+               session => $session,
+               changes => [IkiWiki::rcs_receive()]
+       );

        exit 0;
 }
 
 sub test_changes {
        exit 0;
 }
 
 sub test_changes {

-        my %params = @_;
-        my $cgi = $params{cgi};
-        my $session = $params{session};
-        my @changes = @{$params{changes}};
+       my %params = @_;
+       my $cgi = $params{cgi};
+       my $session = $params{session};
+       my @changes = @{$params{changes}};

 
        my %newfiles;
        foreach my $change (@changes) {
 
        my %newfiles;
        foreach my $change (@changes) {


@@ -116,10 +116,6 @@ sub test_changes {
                                        IkiWiki::check_canedit($file, $cgi, $session);
                                        next;
                                }
                                        IkiWiki::check_canedit($file, $cgi, $session);
                                        next;
                                }

-                                else {
-                                use Data::Dumper;
-                                die "fall through test_changes add: " . Data::Dumper::Dumper($change);
-                                }

                        }
                }
                elsif ($change->{action} eq 'remove') {
                        }
                }
                elsif ($change->{action} eq 'remove') {