po: remove all dependencies on nicepagetitle

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

diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm
index b43c5282ab0dd841da52017c1a456fc573c052a3..f39c93332e311fd3cc452e06525c2d4827eef984 100644 (file)
--- a/IkiWiki/Plugin/rename.pm
+++ b/IkiWiki/Plugin/rename.pm
@@ -216,7 +216,7 @@ sub postrename ($;$$$) {
                # Update edit form content to fix any links present
                # on it.
                $postrename->param("editcontent",
                # Update edit form content to fix any links present
                # on it.
                $postrename->param("editcontent",

-                       renamelink_hook($dest, $src, $dest,
+                       renamepage_hook($dest, $src, $dest,

                                 $postrename->param("editcontent")));
 
                # Get a new edit token; old was likely invalidated.
                                 $postrename->param("editcontent")));
 
                # Get a new edit token; old was likely invalidated.


@@ -312,7 +312,13 @@ sub sessioncgi ($$) {
                                required => 1,
                        };
 
                                required => 1,
                        };
 

-                       IkiWiki::run_hooks(rename => sub { shift->(\@torename, $q, $session); });
+                       IkiWiki::run_hooks(rename => sub {
+                               @torename=shift->(
+                                       torename => \@torename,
+                                       cgi => $q,
+                                       session => $session
+                               );
+                       });

 
                        # See if any subpages need to be renamed.
                        if ($q->param("subpages") && $src ne $dest) {
 
                        # See if any subpages need to be renamed.
                        if ($q->param("subpages") && $src ne $dest) {


@@ -446,10 +452,10 @@ sub linklist {
        } @{$list}]
 }
 
        } @{$list}]
 }
 

-sub renamelink_hook ($$$$) {
+sub renamepage_hook ($$$$) {

        my ($page, $src, $dest, $content)=@_;
 
        my ($page, $src, $dest, $content)=@_;
 

-       IkiWiki::run_hooks(renamelink => sub {
+       IkiWiki::run_hooks(renamepage => sub {

                $content=shift->(
                        page => $page,
                        oldpage => $src,
                $content=shift->(
                        page => $page,
                        oldpage => $src,


@@ -506,7 +512,7 @@ sub fixlinks ($$$) {
                if ($needfix) {
                        my $file=$pagesources{$page};
                        my $oldcontent=readfile($config{srcdir}."/".$file);
                if ($needfix) {
                        my $file=$pagesources{$page};
                        my $oldcontent=readfile($config{srcdir}."/".$file);

-                       my $content=renamelink_hook($page, $rename->{src}, $rename->{dest}, $oldcontent);
+                       my $content=renamepage_hook($page, $rename->{src}, $rename->{dest}, $oldcontent);

                        if ($oldcontent ne $content) {
                                my $token=IkiWiki::rcs_prepedit($file);
                                eval { writefile($file, $config{srcdir}, $content) };
                        if ($oldcontent ne $content) {
                                my $token=IkiWiki::rcs_prepedit($file);
                                eval { writefile($file, $config{srcdir}, $content) };