diff options
| -rw-r--r-- | IkiWiki/Plugin/rename.pm | 4 | ||||
| -rw-r--r-- | debian/changelog | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm index aa1081756..8e32d41ae 100644 --- a/IkiWiki/Plugin/rename.pm +++ b/IkiWiki/Plugin/rename.pm @@ -184,7 +184,7 @@ sub rename_start ($$$$) { my $held=$attachment && IkiWiki::Plugin::attachment->can("is_held_attachment") && IkiWiki::Plugin::attachment::is_held_attachment($page); - if (! defined $held) { + if (! $held) { check_canrename($page, $pagesources{$page}, undef, undef, $q, $session); } @@ -322,7 +322,7 @@ sub sessioncgi ($$) { my $held=$q->param("attachment") && IkiWiki::Plugin::attachment->can("is_held_attachment") && IkiWiki::Plugin::attachment::is_held_attachment($src); - if (defined $held) { + if ($held) { rename($held, IkiWiki::Plugin::attachment::attachment_holding_location($dest)); postrename($session, $src, $dest, $q->param("attachment")) unless defined $srcfile; diff --git a/debian/changelog b/debian/changelog index 8817d5b5d..253bb379d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +ikiwiki (3.20110713) UNRELEASED; urgency=low + + * rename: Fix logic error that broke renaming pages when the attachment + plugin was disabled. + * rename: Fix logic error that bypassed the usual pagespec checks. + + -- Joey Hess <joeyh@debian.org> Fri, 15 Jul 2011 18:36:29 -0400 + ikiwiki (3.20110712) unstable; urgency=low * attachment: Bugfix to create directory when moving attachment out of |