remove misplaced usepage and wrong workaround for it

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

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 0dbe9611af72f31a1fcc6084049375fae8286d59..5288abc6dc40549c8debe95c6259172deb51b7b1 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -5,7 +5,6 @@ package IkiWiki;
 use warnings;
 use strict;
 use IkiWiki;
 use warnings;
 use strict;
 use IkiWiki;

-use Encode;

 
 my (%backlinks, %rendered);
 our %brokenlinks;
 
 my (%backlinks, %rendered);
 our %brokenlinks;


@@ -94,7 +93,8 @@ sub genpage ($$) {
        }
        if (defined $config{historyurl} && length $config{historyurl}) {
                my $u=$config{historyurl};
        }
        if (defined $config{historyurl} && length $config{historyurl}) {
                my $u=$config{historyurl};

-               $u=~s/\[\[file\]\]/$pagesources{$page}/g;
+               my $p=uri_escape_utf8($pagesources{$page}, '^A-Za-z0-9\-\._~/');
+               $u=~s/\[\[file\]\]/$p/g;

                $template->param(historyurl => $u);
                $actions++;
        }
                $template->param(historyurl => $u);
                $actions++;
        }


@@ -760,7 +760,7 @@ sub refresh () {
        my ($del, $internal_del)=find_del_files($pages);
        my ($changed, $internal_changed)=find_changed($files);
        run_hooks(needsbuild => sub {
        my ($del, $internal_del)=find_del_files($pages);
        my ($changed, $internal_changed)=find_changed($files);
        run_hooks(needsbuild => sub {

-               my $ret=shift->($changed);
+               my $ret=shift->($changed, [@$del, @$internal_del]);

                $changed=$ret if ref $ret eq 'ARRAY';
        });
        my $oldlink_targets=calculate_old_links($changed, $del);
                $changed=$ret if ref $ret eq 'ARRAY';
        });
        my $oldlink_targets=calculate_old_links($changed, $del);