comments: serve avatars over https in https wikis

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

diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index f73e355ee3ecf49a005b1b31f8ca8567427998e6..647a671a518b9b9c4cdafbffc7675da661c8a0b6 100644 (file)
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -92,7 +92,7 @@ sub formbuilder_setup (@) {
                # Add the toggle javascript; the attachments interface uses
                # it to toggle visibility.
                require IkiWiki::Plugin::toggle;
-               $form->tmpl_param("javascript" => IkiWiki::Plugin::toggle::include_javascript($params{page}, 1));
+               $form->tmpl_param("javascript" => IkiWiki::Plugin::toggle::include_javascript($params{page}));
                # Start with the attachments interface toggled invisible,
                # but if it was used, keep it open.
                if ($form->submitted ne "Upload Attachment" &&
@@ -242,7 +242,7 @@ sub attachment_list ($) {
                        push @ret, {
                                "field-select" => '<input type="checkbox" name="attachment_select" value="'.$f.'" />',
                                link => htmllink($page, $page, $f, noimageinline => 1),
-                               size => IkiWiki::Plugin::filecheck::humansize((stat(_))[7]),
+                               size => IkiWiki::Plugin::filecheck::humansize((stat($f))[7]),
                                mtime => displaytime($IkiWiki::pagemtime{$f}),
                                mtime_raw => $IkiWiki::pagemtime{$f},
                        };