Bug 773354 - "name" attribute of image map not urlencoded, not working in Chrome

2 files changed, 2 insertions, 3 deletions

diff --git a/src/context.cpp b/src/context.cpp
index e13aa69..2d4200e 100644
--- a/src/context.cpp
+++ b/src/context.cpp
@@ -1989,7 +1989,7 @@ class ClassContext::Private : public DefinitionContext<ClassContext::Private>
               t << "<img src=\"";
               t << relPathAsString() << m_classDef->getOutputFileBase();
               t << ".png\" usemap=\"#" << convertToId(name) << "_map\" alt=\"\"/>" << endl;
-              t << "<map id=\"" << convertToId(name) << "_map\" name=\"" << name << "_map\">" << endl;
+              t << "<map id=\"" << convertToId(name) << "_map\" name=\"" << convertToId(name) << "_map\">" << endl;
               d.writeImage(t,g_globals.outputDir,
                            relPathAsString(),
                            m_classDef->getOutputFileBase());
diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp
index 24af9fc..5b4519b 100644
--- a/src/htmlgen.cpp
+++ b/src/htmlgen.cpp
@@ -1359,8 +1359,7 @@ void HtmlGenerator::endClassDiagram(const ClassDiagram &d,
   t << relPath << fileName << ".png\" usemap=\"#" << convertToId(name);
   t << "_map\" alt=\"\"/>" << endl;
   t << "  <map id=\"" << convertToId(name);
-  t << "_map\" name=\"";
-  docify(name);
+  t << "_map\" name=\"" << convertToId(name);
   t << "_map\">" << endl;
 
   d.writeImage(t,dir,relPath,fileName);