* Detect invalid pagespecs and do not merge them in add_depends,

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

diff --git a/IkiWiki/Plugin/graphviz.pm b/IkiWiki/Plugin/graphviz.pm
index ee97c71d1d9e109fca01673766007e2f091ba438..ec48bad2c859fef49b87cce9f249113d3875a8d3 100644 (file)
--- a/IkiWiki/Plugin/graphviz.pm
+++ b/IkiWiki/Plugin/graphviz.pm
@@ -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;
@@ -69,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 (@) { #{{{