* Use forcebaseurl to make page previews be displayed with the html base

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

diff --git a/IkiWiki/Plugin/graphviz.pm b/IkiWiki/Plugin/graphviz.pm
index 48f520c4f92f9fc7279852d017310d20ed061a25..ec48bad2c859fef49b87cce9f249113d3875a8d3 100644 (file)
--- a/IkiWiki/Plugin/graphviz.pm
+++ b/IkiWiki/Plugin/graphviz.pm
@@ -5,7 +5,7 @@ package IkiWiki::Plugin::graphviz;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 2.00;
 use IPC::Open2;
 
 sub import { #{{{
@@ -29,10 +29,10 @@ sub render_graph (\%) { #{{{
        # Use the sha1 of the graphviz code as part of its filename.
        eval q{use Digest::SHA1};
        error($@) if $@;
-       my $dest=$params{page}."/graph-".
+       my $dest=$params{destpage}."/graph-".
                IkiWiki::possibly_foolish_untaint(Digest::SHA1::sha1_hex($src)).
                ".png";
-       will_render($params{page}, $dest);
+       will_render($params{destpage}, $dest);
 
        if (! -e "$config{destdir}/$dest") {
                my $pid;
@@ -41,7 +41,6 @@ sub render_graph (\%) { #{{{
                $pid=open2(*IN, *OUT, "$params{prog} -Tpng");
 
                # open2 doesn't respect "use open ':utf8'"
-               binmode (IN, ':utf8');
                binmode (OUT, ':utf8');
 
                print OUT $src;
@@ -70,7 +69,12 @@ sub render_graph (\%) { #{{{
                }
        }
 
-       return "<img src=\"".urlto($dest, $params{page})."\" />\n";
+       if ($params{preview}) {
+               return "<img src=\"".urlto($dest, "")."\" />\n";
+       }
+       else {
+               return "<img src=\"".urlto($dest, $params{destpage})."\" />\n";
+       }
 } #}}}
 
 sub graph (@) { #{{{