Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info

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

diff --git a/IkiWiki/Plugin/graphviz.pm b/IkiWiki/Plugin/graphviz.pm
index 5d666e1be68d854e8c4e00f96c627de699521859..fb32392279cbff0e0e4aa7ad434ce9b3a6acc03d 100644 (file)
--- a/IkiWiki/Plugin/graphviz.pm
+++ b/IkiWiki/Plugin/graphviz.pm
@@ -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{page})."\" />\n";
+       }
 } #}}}
 
 sub graph (@) { #{{{