fix update of links to removed pages

diff --git a/doc/bugs.mdwn b/doc/bugs.mdwn
index 5d50dca9ca583724b87d52fb9eea53623e3356b5..888e1d0d53209f06727c3c339764ab9111893b95 100644 (file)
--- a/doc/bugs.mdwn
+++ b/doc/bugs.mdwn
@@ -14,5 +14,4 @@
 * RecentChanges is a regular page, perhaps it should be automatically
   replaced with a link to the [[CGI]]?
 * [[ikiwiki]] should go to the same place as [[index]] (on this wiki).
 * RecentChanges is a regular page, perhaps it should be automatically
   replaced with a link to the [[CGI]]?
 * [[ikiwiki]] should go to the same place as [[index]] (on this wiki).

-* Doesn't update pages that linked to a page when it is removed.
-* Various inneficencies cause it to sometimes render the same page 3 times for one change. This could be fixed for a 3 fold speedup on commits.
\ No newline at end of file
+* Various inneficencies cause it to sometimes render the same page 3 times for one change. This could be fixed for a 3 fold speedup on commits.>>>>>>> .r230

diff --git a/ikiwiki b/ikiwiki
index fd9904e3daf9e6c682baf61f51239b7c2dc5d46e..40356f1d35426acd67e96d38a3fb69d9e65aa47c 100755 (executable)
--- a/ikiwiki
+++ b/ikiwiki
@@ -564,10 +564,9 @@ sub prune ($) { #{{{
 } #}}}
 
 sub refresh () { #{{{
 } #}}}
 
 sub refresh () { #{{{

-       # Find existing pages.
+       # find existing pages

        my %exists;
        my @files;
        my %exists;
        my @files;

-       

        eval q{use File::Find};
        find({
                no_chdir => 1,
        eval q{use File::Find};
        find({
                no_chdir => 1,


@@ -608,7 +607,7 @@ sub refresh () { #{{{
        foreach my $page (keys %oldpagemtime) {
                if (! $exists{$page}) {
                        debug("removing old page $page");
        foreach my $page (keys %oldpagemtime) {
                if (! $exists{$page}) {
                        debug("removing old page $page");

-                       push @del, $renderedfiles{$page};
+                       push @del, $pagesources{$page};

                        prune($config{destdir}."/".$renderedfiles{$page});
                        delete $renderedfiles{$page};
                        $oldpagemtime{$page}=0;
                        prune($config{destdir}."/".$renderedfiles{$page});
                        delete $renderedfiles{$page};
                        $oldpagemtime{$page}=0;