summaryrefslogtreecommitdiffstats
path: root/src/htmldocvisitor.cpp
diff options
context:
space:
mode:
authoralbert-github <albert.tests@gmail.com>2019-01-06 11:31:51 (GMT)
committeralbert-github <albert.tests@gmail.com>2019-01-06 11:31:51 (GMT)
commita53d5b44731b55197d7ff2ae046552374d011e59 (patch)
treea1ae128f2c331230f7be24db5704a8f3cb46fe85 /src/htmldocvisitor.cpp
parentde34e6c26eeb0dca1b1a6aa8bf26d21bb3fd644f (diff)
downloadDoxygen-a53d5b44731b55197d7ff2ae046552374d011e59.zip
Doxygen-a53d5b44731b55197d7ff2ae046552374d011e59.tar.gz
Doxygen-a53d5b44731b55197d7ff2ae046552374d011e59.tar.bz2
issue #6744 Ampersand in Markdown image URL is not escaped in XML output
Convert name / url based on HTML / XML conventions and don't do double conversions (XML).
Diffstat (limited to 'src/htmldocvisitor.cpp')
-rw-r--r--src/htmldocvisitor.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/htmldocvisitor.cpp b/src/htmldocvisitor.cpp
index 8c78f85..9f9e653 100644
--- a/src/htmldocvisitor.cpp
+++ b/src/htmldocvisitor.cpp
@@ -1584,7 +1584,7 @@ void HtmlDocVisitor::visitPre(DocHRef *href)
else
{
QCString url = correctURL(href->url(),href->relPath());
- m_t << "<a href=\"" << convertToXML(url) << "\""
+ m_t << "<a href=\"" << convertToHtml(url) << "\""
<< htmlAttribsToString(href->attribs()) << ">";
}
}
@@ -1668,7 +1668,7 @@ void HtmlDocVisitor::visitPre(DocImage *img)
}
else
{
- m_t << "<img src=\"" << src << "\" alt=\"" << alt << "\"" << sizeAttribs << attrs;
+ m_t << "<img src=\"" << convertToHtml(src) << "\" alt=\"" << alt << "\"" << sizeAttribs << attrs;
if (inlineImage)
{
m_t << " class=\"inline\"";