* Define expected number of tests near the top.

[git.ikiwiki.info.git] / IkiWiki / Plugin / rename.pm

diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm
index aa108175667fce0e23493a45c14d3ec2542819b1..8e32d41aecfd58934fc7353612c680162abd2914 100644 (file)
--- 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);
        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);
        }
                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);
                        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;
                                rename($held, IkiWiki::Plugin::attachment::attachment_holding_location($dest));
                                postrename($session, $src, $dest, $q->param("attachment"))
                                        unless defined $srcfile;