From: mkanat%bugzilla.org <>
Date: Sat, 16 Dec 2006 09:47:12 +0000 (+0000)
Subject: Bug 345405: showdependencygraph.cgi: Dependency Graphs are broken on mod_perl
X-Git-Tag: bugzilla-2.23.4~159
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9bb5d80bb96021d092a3a955a7244c441e9a1e11;p=thirdparty%2Fbugzilla.git

Bug 345405: showdependencygraph.cgi: Dependency Graphs are broken on mod_perl
Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=LpSolit, a=myk
---

diff --git a/Bugzilla/Constants.pm b/Bugzilla/Constants.pm
index 9e37f9f5c4..67e0a92252 100644
--- a/Bugzilla/Constants.pm
+++ b/Bugzilla/Constants.pm
@@ -433,7 +433,7 @@ sub bz_locations {
         # change showdependencygraph.cgi to set image_url to the correct 
         # location.
         # The script should really generate these graphs directly...
-        'webdotdir'   => "$datadir/webdot",
+        'webdotdir'   => "$libpath/$datadir/webdot",
         'extensionsdir' => "$libpath/extensions",
     };
 }
diff --git a/showdependencygraph.cgi b/showdependencygraph.cgi
index 2cea9b2f2d..77259182f8 100755
--- a/showdependencygraph.cgi
+++ b/showdependencygraph.cgi
@@ -247,6 +247,11 @@ if ($webdotbase =~ /^https?:/) {
     
     # On Windows $pngfilename will contain \ instead of /
     $pngfilename =~ s|\\|/|g if $^O eq 'MSWin32';
+
+    # Under mod_perl, pngfilename will have an absolute path, and we
+    # need to make that into a relative path.
+    my $cgi_root = bz_locations()->{cgi_path};
+    $pngfilename =~ s/^\Q$cgi_root\E//;
     
     $vars->{'image_url'} = $pngfilename;