diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2010-03-26 00:16:21 -0400 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2010-03-26 00:16:21 -0400 |
| commit | 243b0dd082cf4b66dfef55b2c9b459109bee7398 (patch) | |
| tree | ff541bf0f75deefb16864549a9982e89399883a3 /IkiWiki | |
| parent | ab89494797ef6e0045428d63251287bbc05fa63b (diff) | |
| download | ikiwiki-243b0dd082cf4b66dfef55b2c9b459109bee7398.tar ikiwiki-243b0dd082cf4b66dfef55b2c9b459109bee7398.tar.gz | |
fix the other half of the filecheck filename bug
Diffstat (limited to 'IkiWiki')
| -rw-r--r-- | IkiWiki/Plugin/remove.pm | 2 | ||||
| -rw-r--r-- | IkiWiki/Plugin/rename.pm | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm index f59d0269e..0fc180f69 100644 --- a/IkiWiki/Plugin/remove.pm +++ b/IkiWiki/Plugin/remove.pm @@ -49,7 +49,7 @@ sub check_canremove ($$$) { # This is sorta overkill, but better safe than sorry. if (! defined pagetype($pagesources{$page})) { if (IkiWiki::Plugin::attachment->can("check_canattach")) { - IkiWiki::Plugin::attachment::check_canattach($session, $page, $file); + IkiWiki::Plugin::attachment::check_canattach($session, $page, "$config{srcdir}/$file"); } else { error("removal of attachments is not allowed"); diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm index 3908443ca..1a9da6363 100644 --- a/IkiWiki/Plugin/rename.pm +++ b/IkiWiki/Plugin/rename.pm @@ -50,7 +50,7 @@ sub check_canrename ($$$$$$) { IkiWiki::check_canedit($src, $q, $session); if ($attachment) { if (IkiWiki::Plugin::attachment->can("check_canattach")) { - IkiWiki::Plugin::attachment::check_canattach($session, $src, $srcfile); + IkiWiki::Plugin::attachment::check_canattach($session, $src, "$config{srcdir}/$srcfile"); } else { error("renaming of attachments is not allowed"); @@ -85,7 +85,7 @@ sub check_canrename ($$$$$$) { if ($attachment) { # Note that $srcfile is used here, not $destfile, # because it wants the current file, to check it. - IkiWiki::Plugin::attachment::check_canattach($session, $dest, $srcfile); + IkiWiki::Plugin::attachment::check_canattach($session, $dest, "$config{srcdir}/$srcfile"); } } |