aboutsummaryrefslogtreecommitdiff
path: root/IkiWiki/Plugin/editpage.pm
diff options
context:
space:
mode:
authorSimon McVittie <smcv@debian.org>2012-04-07 17:52:29 +0100
committerSimon McVittie <smcv@debian.org>2012-04-07 17:52:29 +0100
commit5674e7fc1273800554c23ad6194e8a06dee851ae (patch)
treec5ae178e0a15350dc44507c5612bd58dae98e2f4 /IkiWiki/Plugin/editpage.pm
parentf5f41fa59af064ce3d5e038154950aefdc8d6f65 (diff)
downloadikiwiki-5674e7fc1273800554c23ad6194e8a06dee851ae.tar
ikiwiki-5674e7fc1273800554c23ad6194e8a06dee851ae.tar.gz
prune: do not prune beyond an optional base directory, and add a test
Previously, prune("wiki/srcdir/sandbox/test.mdwn") could delete srcdir or even wiki, if they happened to be empty. This is rarely what you want: there's usually some base directory (destdir, srcdir, transientdir or another subdirectory of wikistatedir) beyond which you do not want to delete.
Diffstat (limited to 'IkiWiki/Plugin/editpage.pm')
-rw-r--r--IkiWiki/Plugin/editpage.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index 54051c58c..d3c695935 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -39,7 +39,7 @@ sub refresh () {
}
if ($delete) {
debug(sprintf(gettext("removing old preview %s"), $file));
- IkiWiki::prune("$config{destdir}/$file");
+ IkiWiki::prune("$config{destdir}/$file", $config{destdir});
}
}
elsif (defined $mtime) {