comments: add regression test for sorting by date

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

diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm
index ad5e726458cedbbb63a069297372e3bb739fe486..e871b815d6441a0cc52131932c283421c78c98c6 100644 (file)
--- a/IkiWiki/Plugin/rename.pm
+++ b/IkiWiki/Plugin/rename.pm
@@ -126,7 +126,7 @@ sub rename_form ($$$) {
                method => 'POST',
                javascript => 0,
                params => $q,
                method => 'POST',
                javascript => 0,
                params => $q,

-               action => $config{cgiurl},
+               action => IkiWiki::cgiurl(),

                stylesheet => 1,
                fields => [qw{do page new_name attachment}],
        );
                stylesheet => 1,
                fields => [qw{do page new_name attachment}],
        );


@@ -567,6 +567,7 @@ sub fixlinks ($$$) {
                }
                if ($needfix) {
                        my $file=$pagesources{$page};
                }
                if ($needfix) {
                        my $file=$pagesources{$page};

+                       next unless -e $config{srcdir}."/".$file;

                        my $oldcontent=readfile($config{srcdir}."/".$file);
                        my $content=renamepage_hook($page, $rename->{src}, $rename->{dest}, $oldcontent);
                        if ($oldcontent ne $content) {
                        my $oldcontent=readfile($config{srcdir}."/".$file);
                        my $content=renamepage_hook($page, $rename->{src}, $rename->{dest}, $oldcontent);
                        if ($oldcontent ne $content) {


@@ -574,11 +575,10 @@ sub fixlinks ($$$) {
                                eval { writefile($file, $config{srcdir}, $content) };
                                next if $@;
                                my $conflict=IkiWiki::rcs_commit(
                                eval { writefile($file, $config{srcdir}, $content) };
                                next if $@;
                                my $conflict=IkiWiki::rcs_commit(

-                                       $file,
-                                       sprintf(gettext("update for rename of %s to %s"), $rename->{srcfile}, $rename->{destfile}),
-                                       $token,
-                                       $session->param("name"),
-                                       $session->remote_addr(),
+                                       file => $file,
+                                       message => sprintf(gettext("update for rename of %s to %s"), $rename->{srcfile}, $rename->{destfile}),
+                                       token => $token,
+                                       session => $session,

                                );
                                push @fixedlinks, $page if ! defined $conflict;
                        }
                                );
                                push @fixedlinks, $page if ! defined $conflict;
                        }