diff options
| author | Joey Hess <joey@kitenet.net> | 2011-01-22 10:20:38 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-01-22 10:20:38 -0400 |
| commit | b5d7469830e3569adc0664b645f1321ba54b3655 (patch) | |
| tree | abfbb5a994d550f485b7fd274eda78b12e5d44e7 | |
| parent | dcfeaaad5b6ac478251e37be777de40da4d0909c (diff) | |
rename: Fix crash when renaming a page that is linked to by a page in an underlay.
Skip fixing links in such pages. The user will get a list of pages that
still link to the old page.
| -rw-r--r-- | IkiWiki/Plugin/rename.pm | 1 | ||||
| -rw-r--r-- | debian/changelog | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm index 57747d3c9..e871b815d 100644 --- a/IkiWiki/Plugin/rename.pm +++ b/IkiWiki/Plugin/rename.pm @@ -567,6 +567,7 @@ sub fixlinks ($$$) { } 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) { diff --git a/debian/changelog b/debian/changelog index 0165a240b..bed0bd6b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,9 @@ ikiwiki (3.20110106) UNRELEASED; urgency=low * inline: Use class rather than id for feedlinks and blogform. (Giuseppe Bilotta) * comments: Fix XSS security hole due to missing validation of page name. + (Thanks, Dave B.) + * rename: Fix crash when renaming a page that is linked to by a page + in an underlay. -- Joey Hess <joeyh@debian.org> Thu, 06 Jan 2011 14:41:34 -0400 |