correcting link

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

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 083061bf62b5cf5bcbc91b911dbf7452b4eed69e..c1048d3c927c3fad75c9a7b88b32dbe3833aa814 100644 (file)
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -156,11 +156,10 @@ sub preprocess (@) {
                (exists $params{alt} ? ' alt="'.$params{alt}.'"' : '').
                (exists $params{title} ? ' title="'.$params{title}.'"' : '').
                (exists $params{class} ? ' class="'.$params{class}.'"' : '').
                (exists $params{alt} ? ' alt="'.$params{alt}.'"' : '').
                (exists $params{title} ? ' title="'.$params{title}.'"' : '').
                (exists $params{class} ? ' class="'.$params{class}.'"' : '').

+               (exists $params{align} && ! exists $params{caption} ? ' align="'.$params{align}.'"' : '').

                (exists $params{id} ? ' id="'.$params{id}.'"' : '').
                ' />';
 
                (exists $params{id} ? ' id="'.$params{id}.'"' : '').
                ' />';
 

-       my $alignclass=exists $params{align} ? "align-$params{align}" : "";
-

        my $link;
        if (! defined $params{link}) {
                $link=$fileurl;
        my $link;
        if (! defined $params{link}) {
                $link=$fileurl;


@@ -170,9 +169,7 @@ sub preprocess (@) {
        }
 
        if (defined $link) {
        }
 
        if (defined $link) {

-               $imgtag='<a href="'.$link.'"'.
-                       (!exists $params{caption} && $alignclass ? ' class="'.$alignclass.'"' : '').
-                       '>'.$imgtag.'</a>';
+               $imgtag='<a href="'.$link.'">'.$imgtag.'</a>';

        }
        else {
                my $b = bestlink($params{page}, $params{link});
        }
        else {
                my $b = bestlink($params{page}, $params{link});


@@ -182,15 +179,13 @@ sub preprocess (@) {
                        $imgtag=htmllink($params{page}, $params{destpage},
                                $params{link}, linktext => $imgtag,
                                noimageinline => 1,
                        $imgtag=htmllink($params{page}, $params{destpage},
                                $params{link}, linktext => $imgtag,
                                noimageinline => 1,

-                               (!exists $params{caption} && $alignclass) ?
-                                       (class => $alignclass) : (),

                        );
                }
        }
 
        if (exists $params{caption}) {
                return '<table class="img'.
                        );
                }
        }
 
        if (exists $params{caption}) {
                return '<table class="img'.

-                       ($alignclass ? ' '.$alignclass : '').
+                       (exists $params{align} ? " align-$params{align}" : "").

                        '">'.
                        '<caption>'.$params{caption}.'</caption>'.
                        '<tr><td>'.$imgtag.'</td></tr>'.
                        '">'.
                        '<caption>'.$params{caption}.'</caption>'.
                        '<tr><td>'.$imgtag.'</td></tr>'.