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

[git.ikiwiki.info.git] / doc / bugs / Problems_with_graphviz.pm_plug-in.mdwn

diff --git a/doc/bugs/Problems_with_graphviz.pm_plug-in.mdwn b/doc/bugs/Problems_with_graphviz.pm_plug-in.mdwn
index 0c679a9103ce603bd67f6dd80e33142b4c7af026..bc80125adfce797334d845e269d53172dcd27d73 100644 (file)
--- a/doc/bugs/Problems_with_graphviz.pm_plug-in.mdwn
+++ b/doc/bugs/Problems_with_graphviz.pm_plug-in.mdwn
@@ -3,49 +3,23 @@ The graphviz.pm plug-in currently attempts to read PNG data in UTF-8 mode, which
     utf8 "\x89" does not map to Unicode at /usr/local/lib/perl5/site_perl/5.8.8/IkiWiki/Plugin/graphviz.pm line 53, <IN> chunk 1.
     Wide character in subroutine entry at /usr/local/lib/perl5/site_perl/5.8.8/IkiWiki/Plugin/graphviz.pm line 68.
 
-> Ok, will remove the binmode IN then. [[done]] --[[Joey]]
+> Ok, will remove the binmode IN then. done --[[Joey]]
 
 >> Thanks --[[HenrikBrixAndersen]]
 
 It also generates image URLs relative to the page being rendered, which means the URLs wont work when previewing a graph from the CGI script.
 
-> You seem to be using an old version of ikiwiki, these preview isues have
-> been fixed for some time, and the code doesn't look like what you patch
-> in your second hunk. --[[Joey]]
+(preview bug split to [[Problems_with_graphviz.pm_plug-in_previews]])
 
->> I have just tested ikiwiki-2.5. The code in question still looks
->> the same, and the patch is still needed for making the graphviz
->> plug-in work in preview mode here.
->>
 >> Here is an updated patch againt ikiwiki-2.5:
 
-
-    --- IkiWiki/Plugin/graphviz.pm.orig        2007-07-27 11:35:05.000000000 +0200
-    +++ IkiWiki/Plugin/graphviz.pm     2007-07-27 11:36:02.000000000 +0200
-    @@ -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{page})."\" />\n";
-    +  }
-     } #}}}
-     
-     sub graph (@) { #{{{
-
-
->> --[[HenrikBrixAndersen]]
-
+>>> [[Applied|done]], thanks. --[[Joey]]
 
 The patch below fixes these two issues.
 
     --- graphviz.pm.orig       Thu Jun  7 15:45:16 2007
     +++ graphviz.pm    Fri Jun  8 12:03:38 2007
-    @@ -41,7 +41,6 @@ sub render_graph (\%) { #{{{
+    @@ -41,7 +41,6 @@ sub render_graph (\%) {
                $pid=open2(*IN, *OUT, "$params{prog} -Tpng");
      
                # open2 doesn't respect "use open ':utf8'"
@@ -53,7 +27,7 @@ The patch below fixes these two issues.
                binmode (OUT, ':utf8');
      
                print OUT $src;
-    @@ -70,7 +69,12 @@ sub render_graph (\%) { #{{{
+    @@ -70,7 +69,12 @@ sub render_graph (\%) {
                }
        }
      
@@ -64,6 +38,6 @@ The patch below fixes these two issues.
     +  else {
     +          return "<img src=\"".urlto($dest, $params{page})."\" />\n";
     +  }
-     } #}}}
+     }
      
-     sub graph (@) { #{{{
+     sub graph (@) {