diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2013-08-03 19:24:08 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2013-08-03 19:24:08 (GMT) |
| commit | 4fcc416870f33b3ee00a0cdd156e267746a136f5 (patch) | |
| tree | 79c2fe905b655ce78648607ffb4c9cc5901ca825 /src/htmlgen.cpp | |
| parent | c7e46bcd26b7f0d804075a6f9d39a9b706022485 (diff) | |
| download | Doxygen-4fcc416870f33b3ee00a0cdd156e267746a136f5.zip Doxygen-4fcc416870f33b3ee00a0cdd156e267746a136f5.tar.gz Doxygen-4fcc416870f33b3ee00a0cdd156e267746a136f5.tar.bz2 | |
Using & in the project name caused invalid HTML and LaTeX output
Diffstat (limited to 'src/htmlgen.cpp')
| -rw-r--r-- | src/htmlgen.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp index 30182a5..6fe61fc 100644 --- a/src/htmlgen.cpp +++ b/src/htmlgen.cpp @@ -1106,10 +1106,12 @@ static QCString substituteHtmlKeywords(const QCString &s, extraCssText = "<link href=\"$relpath^"+stripPath(extraCssFile)+"\" rel=\"stylesheet\" type=\"text/css\"/>\n"; } - if (timeStamp) { - generatedBy = theTranslator->trGeneratedAt(dateToString(TRUE), Config_getString("PROJECT_NAME")); + if (timeStamp) + { + generatedBy = theTranslator->trGeneratedAt(dateToString(TRUE), convertToHtml(Config_getString("PROJECT_NAME"))); } - else { + else + { generatedBy = theTranslator->trGeneratedBy(); } @@ -3084,7 +3086,7 @@ void HtmlGenerator::writeSearchPage() FTextStream t(&cf); t << "<script language=\"php\">\n\n"; t << "$config = array(\n"; - t << " 'PROJECT_NAME' => \"" << projectName << "\",\n"; + t << " 'PROJECT_NAME' => \"" << convertToHtml(projectName) << "\",\n"; t << " 'GENERATE_TREEVIEW' => " << (generateTreeView?"true":"false") << ",\n"; t << " 'DISABLE_INDEX' => " << (disableIndex?"true":"false") << ",\n"; t << ");\n\n"; |