Detect image type from .JPG just like .jpg (etc.).

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

diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index fd4096edf7de153ef01145f310c459f255e3fffc..aea70429d0bcc3bc86a776ba8b2dde8352483a37 100644 (file)
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -148,7 +148,7 @@ sub formbuilder (@) {
                        $f=Encode::decode_utf8($f);
                        $f=~s/^$page\///;
                        if (IkiWiki::isinlinableimage($f) &&
                        $f=Encode::decode_utf8($f);
                        $f=~s/^$page\///;
                        if (IkiWiki::isinlinableimage($f) &&

-                           UNIVERSAL::can("IkiWiki::Plugin::img", "import")) {
+                           IkiWiki::Plugin::img->can("import")) {

                                $add.='[[!img '.$f.' align="right" size="" alt=""]]';
                        }
                        else {
                                $add.='[[!img '.$f.' align="right" size="" alt=""]]';
                        }
                        else {


@@ -272,6 +272,7 @@ sub attachments_save {
        my @attachments;
        my $dir=attachment_holding_location($form->field('page'));
        foreach my $filename (glob("$dir/*")) {
        my @attachments;
        my $dir=attachment_holding_location($form->field('page'));
        foreach my $filename (glob("$dir/*")) {

+               $filename=Encode::decode_utf8($filename);

                next unless -f $filename;
                my $destdir=$config{srcdir}."/".
                        linkpage(IkiWiki::possibly_foolish_untaint(
                next unless -f $filename;
                my $destdir=$config{srcdir}."/".
                        linkpage(IkiWiki::possibly_foolish_untaint(


@@ -285,7 +286,7 @@ sub attachments_save {
        }
        return unless @attachments;
        require IkiWiki::Render;
        }
        return unless @attachments;
        require IkiWiki::Render;

-       IkiWiki::prune($dir);
+       IkiWiki::prune($dir, $config{wikistatedir}."/attachments");

 
        # Check the attachments in and trigger a wiki refresh.
        if ($config{rcs}) {
 
        # Check the attachments in and trigger a wiki refresh.
        if ($config{rcs}) {


@@ -345,6 +346,7 @@ sub attachment_list ($) {
        my $dir=attachment_holding_location($page);
        my $heldmsg=gettext("this attachment is not yet saved");
        foreach my $file (glob("$dir/*")) {
        my $dir=attachment_holding_location($page);
        my $heldmsg=gettext("this attachment is not yet saved");
        foreach my $file (glob("$dir/*")) {

+               $file=Encode::decode_utf8($file);

                next unless -f $file;
                my $base=IkiWiki::basename($file);
                my $f=$loc.$base;
                next unless -f $file;
                my $base=IkiWiki::basename($file);
                my $f=$loc.$base;