]> sipb.mit.edu Git - ikiwiki.git/commitdiff
save attachments when page is saved too
authorJoey Hess <joey@kodama.kitenet.net>
Tue, 1 Jul 2008 20:13:47 +0000 (16:13 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Tue, 1 Jul 2008 20:13:47 +0000 (16:13 -0400)
A user might specify an attachment, but not click the upload button,
and just save the whole page instead.

IkiWiki/Plugin/attachment.pm

index 4141cc04aada87ef1748fc360c9ebbc1f4acd831..48cd954d958c3220a753c93867ae01985d13d2eb 100644 (file)
@@ -52,7 +52,7 @@ sub formbuilder (@) { #{{{
 
        return if $form->field("do") ne "edit";
 
-       if ($form->submitted eq "Upload") {
+       if ($form->submitted eq "Upload" || $form->submitted eq "Save Page") {
                my $q=$params{cgi};
                my $session=$params{session};
 
@@ -112,7 +112,6 @@ sub formbuilder (@) { #{{{
                                error("failed to get filehandle");
                        }
                        binmode($fh);
-                       print STDERR "copying $filename\n";
                        writefile($filename, $config{srcdir}, undef, 1, sub {
                                IkiWiki::fast_file_copy($tempfile, $filename, $fh, @_);
                        });
@@ -128,7 +127,6 @@ sub formbuilder (@) { #{{{
                        IkiWiki::enable_commit_hook();
                        IkiWiki::rcs_update();
                }
-               print STDERR "refreshing\n";
                IkiWiki::refresh();
                IkiWiki::saveindex();
        }