Merge remote branch 'smcv/ready/localurl'

[ikiwiki.git] / IkiWiki / Plugin / img.pm

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index a69175ba69bd78e5678f32bd1183d65e639b1c9d..b554a3dfc94a6c6cdd380f8e3461e6b2ec648e6a 100644 (file)
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -39,7 +39,7 @@ sub preprocess (@) {
                }
        }
 
-       if (! exists $params{size}) {
+       if (! exists $params{size} || ! length $params{size}) {
                $params{size}='full';
        }
 
@@ -152,8 +152,12 @@ sub preprocess (@) {
                $imgurl=urlto($imglink, $params{destpage});
        }
        else {
-               $fileurl="$config{url}/$file";
-               $imgurl="$config{url}/$imglink";
+               $fileurl=urlto($file, undef);
+               $imgurl=urlto($imglink, undef);
+       }
+
+       if (! exists $params{class}) {
+               $params{class}="img";
        }
 
        my $attrs='';