comment: Don't show comments of subpages on parent pages. (Fixes bug introduced in...

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

diff --git a/IkiWiki/Plugin/graphviz.pm b/IkiWiki/Plugin/graphviz.pm
index b43e96a73adad4b1b8091c689110c70611a983f6..4ed8b89f165847832762408c05b0abedc21aaf6c 100644 (file)
--- a/IkiWiki/Plugin/graphviz.pm
+++ b/IkiWiki/Plugin/graphviz.pm
@@ -18,6 +18,7 @@ sub getsetup () {
                plugin => {
                        safe => 1,
                        rebuild => undef,
                plugin => {
                        safe => 1,
                        rebuild => undef,

+                       section => "widget",

                },
 }
 
                },
 }
 


@@ -36,16 +37,16 @@ sub render_graph (\%) {
        $src .= "}\n";
 
        # Use the sha1 of the graphviz code as part of its filename.
        $src .= "}\n";
 
        # Use the sha1 of the graphviz code as part of its filename.

-       eval q{use Digest::SHA1};
+       eval q{use Digest::SHA};

        error($@) if $@;
        my $dest=$params{page}."/graph-".
        error($@) if $@;
        my $dest=$params{page}."/graph-".

-               IkiWiki::possibly_foolish_untaint(Digest::SHA1::sha1_hex($src)).
+               IkiWiki::possibly_foolish_untaint(Digest::SHA::sha1_hex($src)).

                ".png";
        will_render($params{page}, $dest);
 
        if (! -e "$config{destdir}/$dest") {
                my $pid;
                ".png";
        will_render($params{page}, $dest);
 
        if (! -e "$config{destdir}/$dest") {
                my $pid;

-               my $sigpipe=0;;
+               my $sigpipe=0;

                $SIG{PIPE}=sub { $sigpipe=1 };
                $pid=open2(*IN, *OUT, "$params{prog} -Tpng");
 
                $SIG{PIPE}=sub { $sigpipe=1 };
                $pid=open2(*IN, *OUT, "$params{prog} -Tpng");
 


@@ -70,7 +71,8 @@ sub render_graph (\%) {
                        writefile($dest, $config{destdir}, $png, 1);
                }
                else {
                        writefile($dest, $config{destdir}, $png, 1);
                }
                else {

-                       # can't write the file, so embed it in a data uri
+                       # in preview mode, embed the image in a data uri
+                       # to avoid temp file clutter

                        eval q{use MIME::Base64};
                        error($@) if $@;
                        return "<img src=\"data:image/png;base64,".
                        eval q{use MIME::Base64};
                        error($@) if $@;
                        return "<img src=\"data:image/png;base64,".


@@ -78,12 +80,7 @@ sub render_graph (\%) {
                }
        }
 
                }
        }
 

-       if ($params{preview}) {
-               return "<img src=\"".urlto($dest, "")."\" />\n";
-       }
-       else {
-               return "<img src=\"".urlto($dest, $params{destpage})."\" />\n";
-       }
+       return "<img src=\"".urlto($dest, $params{destpage})."\" />\n";

 }
 
 sub graph (@) {
 }
 
 sub graph (@) {