urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fix problems with previewing in the graphviz plugin. Thanks, 

HenrikBrixAndersen.
master
joey 2007-07-29 22:34:42 +00:00
parent 0931723fab
commit f371f2f2d8
3 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
IkiWiki/Plugin/graphviz.pm
View File

@ -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 (@) { #{{{

4
debian/changelog vendored
View File

@ -2,8 +2,10 @@ ikiwiki (2.6) UNRELEASED; urgency=low
* Various minor bug fixes for silly mistakes in the code, thanks to the
various reviewers.
* Fix problems with previewing in the graphviz plugin. Thanks,
HenrikBrixAndersen.
-- Joey Hess <joeyh@debian.org> Sat, 28 Jul 2007 17:01:35 -0400
-- Joey Hess <joeyh@debian.org> Sun, 29 Jul 2007 18:34:13 -0400
ikiwiki (2.5) unstable; urgency=low

14
doc/bugs/Problems_with_graphviz.pm_plug-in.mdwn
View File

@ -9,21 +9,9 @@ The graphviz.pm plug-in currently attempts to read PNG data in UTF-8 mode, which
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]]
>> 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.
>>> No, the relevant code is just above the bit you patched. Notice that in
>>> preview mode, it returns an img tag with the graphviz drawing embedded
>>> in it, using base64 encoding. Unless you can show me why that doesn't
>>> work, I still think this bug is done. --[[Joey]]
>> Here is an updated patch againt ikiwiki-2.5:
>>> [[Applied|done]], thanks. --[[Joey]]
--- 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