summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2018-07-07 11:12:43 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2018-07-07 11:12:43 (GMT)
commit2445159ccdfb97361bbb3922db107f3a6eafb0c9 (patch)
tree7ecc842ad7d9f8bd027361dc255377d591cab488
parent992204b8a0d8cd509d8da9f17366054a2b7ffa37 (diff)
parent80c321c6856e7923e99c2ece878da5625566712c (diff)
downloadDoxygen-2445159ccdfb97361bbb3922db107f3a6eafb0c9.zip
Doxygen-2445159ccdfb97361bbb3922db107f3a6eafb0c9.tar.gz
Doxygen-2445159ccdfb97361bbb3922db107f3a6eafb0c9.tar.bz2
Merge branch 'albert-github-feature/bug_tooltip_apostrophe'
-rw-r--r--src/htmlgen.cpp2
-rw-r--r--src/textdocvisitor.cpp5
2 files changed, 1 insertions, 6 deletions
diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp
index 740b2f5..32eaff6 100644
--- a/src/htmlgen.cpp
+++ b/src/htmlgen.cpp
@@ -606,7 +606,7 @@ void HtmlCodeGenerator::writeTooltip(const char *id, const DocLinkInfo &docInfo,
if (desc)
{
m_t << "<div class=\"ttdoc\">";
- docify(desc); // desc is already HTML escaped; but there are still < and > signs
+ docify(desc);
m_t << "</div>";
}
if (!defInfo.file.isEmpty())
diff --git a/src/textdocvisitor.cpp b/src/textdocvisitor.cpp
index 8c8ecad..c899232 100644
--- a/src/textdocvisitor.cpp
+++ b/src/textdocvisitor.cpp
@@ -50,11 +50,6 @@ void TextDocVisitor::filter(const char *str)
switch(c)
{
case '\n': m_t << " "; break;
- case '"': m_t << "&quot;"; break;
- case '\'': m_t << "&#39;"; break;
- case '<': m_t << "&lt;"; break;
- case '>': m_t << "&gt;"; break;
- case '&': m_t << "&amp;"; break;
default: m_t << c;
}
}