Using & in the project name caused invalid HTML and LaTeX output

2 files changed, 12 insertions, 6 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";
diff --git a/src/latexgen.cpp b/src/latexgen.cpp
index 7ab75c7..49f06fe 100644
--- a/src/latexgen.cpp
+++ b/src/latexgen.cpp
@@ -366,8 +366,12 @@ static void writeDefaultHeaderPart1(FTextStream &t)
        "\n";
 
   // Headers & footers
-  QCString genString =
-        theTranslator->trGeneratedAt(dateToString(TRUE),Config_getString("PROJECT_NAME"));
+  QGString genString;
+  FTextStream tg(&genString);
+  filterLatexString(tg,
+                    theTranslator->trGeneratedAt(dateToString(TRUE),
+                       Config_getString("PROJECT_NAME")),
+                    FALSE,FALSE,FALSE);
   t << "% Headers & footers\n"
        "\\usepackage{fancyhdr}\n"
        "\\pagestyle{fancyplain}\n"