diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-07-29 22:34:42 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-07-29 22:34:42 +0000 |
| commit | f371f2f2d817a7928bb989cb22d0519ebbd79391 (patch) | |
| tree | b1f448d8c3b54206fd977442d76ed544a7f287e1 | |
| parent | 0931723fab9b16ad5a3c3b617a0e0c6f460d832f (diff) | |
| download | ikiwiki-f371f2f2d817a7928bb989cb22d0519ebbd79391.tar ikiwiki-f371f2f2d817a7928bb989cb22d0519ebbd79391.tar.gz | |
* Fix problems with previewing in the graphviz plugin. Thanks,
HenrikBrixAndersen.
| -rw-r--r-- | IkiWiki/Plugin/graphviz.pm | 7 | ||||
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | doc/bugs/Problems_with_graphviz.pm_plug-in.mdwn | 14 |
3 files changed, 10 insertions, 15 deletions
diff --git a/IkiWiki/Plugin/graphviz.pm b/IkiWiki/Plugin/graphviz.pm index ee97c71d1..fb3239227 100644 --- a/IkiWiki/Plugin/graphviz.pm +++ b/IkiWiki/Plugin/graphviz.pm @@ -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 (@) { #{{{ diff --git a/debian/changelog b/debian/changelog index 17412d9d0..ae575b916 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 diff --git a/doc/bugs/Problems_with_graphviz.pm_plug-in.mdwn b/doc/bugs/Problems_with_graphviz.pm_plug-in.mdwn index 1ec3e32bc..9a26e505a 100644 --- a/doc/bugs/Problems_with_graphviz.pm_plug-in.mdwn +++ b/doc/bugs/Problems_with_graphviz.pm_plug-in.mdwn @@ -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 |