rename: Fix double-escaping of page name in edit box.

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

diff --git a/IkiWiki/Plugin/graphviz.pm b/IkiWiki/Plugin/graphviz.pm
index fb32392279cbff0e0e4aa7ad434ce9b3a6acc03d..20b419413094f5f7dbbbd16ec78efca947da3e01 100644 (file)
--- a/IkiWiki/Plugin/graphviz.pm
+++ b/IkiWiki/Plugin/graphviz.pm
@@ -9,9 +9,18 @@ use IkiWiki 2.00;
 use IPC::Open2;
 
 sub import { #{{{
+       hook(type => "getsetup", id => "graphviz", call => \&getsetup);
        hook(type => "preprocess", id => "graph", call => \&graph);
 } # }}}
 
+sub getsetup () { #{{{
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+} #}}}
+
 my %graphviz_programs = (
        "dot" => 1, "neato" => 1, "fdp" => 1, "twopi" => 1, "circo" => 1
 );
@@ -55,7 +64,7 @@ sub render_graph (\%) { #{{{
 
                waitpid $pid, 0;
                $SIG{PIPE}="DEFAULT";
-               return  "[[graph ".gettext("failed to run graphviz")."]]" if ($sigpipe);
+               error gettext("failed to run graphviz") if $sigpipe;
 
                if (! $params{preview}) {
                        writefile($dest, $config{destdir}, $png, 1);
@@ -73,7 +82,7 @@ sub render_graph (\%) { #{{{
                return "<img src=\"".urlto($dest, "")."\" />\n";
        }
        else {
-               return "<img src=\"".urlto($dest, $params{page})."\" />\n";
+               return "<img src=\"".urlto($dest, $params{destpage})."\" />\n";
        }
 } #}}}
 
@@ -82,7 +91,7 @@ sub graph (@) { #{{{
        $params{src} = "" unless defined $params{src};
        $params{type} = "digraph" unless defined $params{type};
        $params{prog} = "dot" unless defined $params{prog};
-       return "[[graph ".gettext("prog not a valid graphviz program")."]]" unless $graphviz_programs{$params{prog}};
+       error gettext("prog not a valid graphviz program") unless $graphviz_programs{$params{prog}};
 
        return render_graph(%params);
 } # }}}