Bug 542464: Dependency graphs cannot be displayed when bug summaries contain UTF8...

r/a=mkanat

diff --git a/showdependencygraph.cgi b/showdependencygraph.cgi
index 6f2a95503d11a81e52b4039086eddd67a7621fb7..76fe0c66d8f853145eb6234b095f76727a559458 100755 (executable)
--- a/showdependencygraph.cgi
+++ b/showdependencygraph.cgi
@@ -58,7 +58,7 @@ local our (%seen, %edgesdone, %bugtitles);
 sub CreateImagemap {
     my $mapfilename = shift;
     my $map = "<map name=\"imagemap\">\n";
-    my $default;
+    my $default = "";
 
     open MAP, "<$mapfilename";
     while(my $line = <MAP>) {
@@ -206,6 +206,10 @@ foreach my $k (keys(%seen)) {
     my @params;
 
     if ($summary ne "" && $cgi->param('showsummary')) {
+        # Wide characters cause GraphViz to die.
+        if (Bugzilla->params->{'utf8'}) {
+            utf8::encode($summary) if utf8::is_utf8($summary);
+        }
         $summary =~ s/([\\\"])/\\$1/g;
         push(@params, qq{label="$k\\n$summary"});
     }