responses

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

diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm
index f90a3b7b7ffd626a98732086794a4bc4a308d642..d6079e198266cf06af8e01a9a9fe351b3c7d1b8d 100644 (file)
--- a/IkiWiki/Plugin/rename.pm
+++ b/IkiWiki/Plugin/rename.pm
@@ -254,7 +254,8 @@ sub sessioncgi ($$) { #{{{
                                my $type=$q->param('type');
                                if (defined $type && length $type && $IkiWiki::hooks{htmlize}{$type}) {
                                        $type=IkiWiki::possibly_foolish_untaint($type);
                                my $type=$q->param('type');
                                if (defined $type && length $type && $IkiWiki::hooks{htmlize}{$type}) {
                                        $type=IkiWiki::possibly_foolish_untaint($type);

-                               } else {
+                               }
+                               else {

                                        my ($ext)=$srcfile=~/\.([^.]+)$/;
                                        $type=$ext;
                                }
                                        my ($ext)=$srcfile=~/\.([^.]+)$/;
                                        $type=$ext;
                                }


@@ -274,7 +275,7 @@ sub sessioncgi ($$) { #{{{
                        if ($config{rcs}) {
                                IkiWiki::rcs_rename($srcfile, $destfile);
                                IkiWiki::rcs_commit_staged(
                        if ($config{rcs}) {
                                IkiWiki::rcs_rename($srcfile, $destfile);
                                IkiWiki::rcs_commit_staged(

-                                       sprintf(gettext("rename %s to %s"), $src, $dest),
+                                       sprintf(gettext("rename %s to %s"), $srcfile, $destfile),

                                        $session->param("name"), $ENV{REMOTE_ADDR});
                        }
                        else {
                                        $session->param("name"), $ENV{REMOTE_ADDR});
                        }
                        else {


@@ -303,7 +304,7 @@ sub sessioncgi ($$) { #{{{
                                                        next if $@;
                                                        my $conflict=IkiWiki::rcs_commit(
                                                                $file,
                                                        next if $@;
                                                        my $conflict=IkiWiki::rcs_commit(
                                                                $file,

-                                                               sprintf(gettext("update for rename of %s to %s"), $src, $dest),
+                                                               sprintf(gettext("update for rename of %s to %s"), $srcfile, $destfile),

                                                                $token,
                                                                $session->param("name"), 
                                                                $ENV{REMOTE_ADDR}
                                                                $token,
                                                                $session->param("name"), 
                                                                $ENV{REMOTE_ADDR}