diff options
| author | luca-aep <67954834+luca-aep@users.noreply.github.com> | 2020-09-16 19:03:18 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-16 19:03:18 (GMT) |
| commit | 49ed5387d6a80bbbff3544293cd30c0184abd1ec (patch) | |
| tree | 935e62f9ac4304ec282537e2e2768fd011004f08 /src | |
| parent | 544843db399c51b77674755f70992f0bdc8403ea (diff) | |
| download | Doxygen-49ed5387d6a80bbbff3544293cd30c0184abd1ec.zip Doxygen-49ed5387d6a80bbbff3544293cd30c0184abd1ec.tar.gz Doxygen-49ed5387d6a80bbbff3544293cd30c0184abd1ec.tar.bz2 | |
Proposed fix for issue #7898 (#8029)
* Proposed fix for issue #7898 - Internal search engine produce ".html" pages instead of using HTML_FILE_EXTENSION
* Applied albert-github suggestions to proposed fix for issue #7898
Diffstat (limited to 'src')
| -rw-r--r-- | src/htmlgen.cpp | 6 | ||||
| -rw-r--r-- | src/searchindex.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp index 601c02e..2c89507 100644 --- a/src/htmlgen.cpp +++ b/src/htmlgen.cpp @@ -1139,7 +1139,7 @@ void HtmlGenerator::startFile(const char *name,const char *, t << "<script type=\"text/javascript\">\n"; t << "/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&dn=gpl-2.0.txt GPL-v2 */\n"; t << "var searchBox = new SearchBox(\"searchBox\", \"" - << m_relPath<< "search\",false,'" << theTranslator->trSearch() << "');\n"; + << m_relPath<< "search\",false,'" << theTranslator->trSearch() << "','" << Doxygen::htmlFileExtension << "');\n"; t << "/* @license-end */\n"; t << "</script>\n"; } @@ -2674,7 +2674,7 @@ void HtmlGenerator::writeSearchPage() t << "<script type=\"text/javascript\">\n"; t << "/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&dn=gpl-2.0.txt GPL-v2 */\n"; t << "var searchBox = new SearchBox(\"searchBox\", \"" - << "search\",false,'" << theTranslator->trSearch() << "');\n"; + << "search\",false,'" << theTranslator->trSearch() << "','" << Doxygen::htmlFileExtension << "');\n"; t << "/* @license-end */\n"; t << "</script>\n"; if (!Config_getBool(DISABLE_INDEX)) @@ -2728,7 +2728,7 @@ void HtmlGenerator::writeExternalSearchPage() t << "<script type=\"text/javascript\">\n"; t << "/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&dn=gpl-2.0.txt GPL-v2 */\n"; t << "var searchBox = new SearchBox(\"searchBox\", \"" - << "search\",false,'" << theTranslator->trSearch() << "');\n"; + << "search\",false,'" << theTranslator->trSearch() << "','" << Doxygen::htmlFileExtension << "');\n"; t << "/* @license-end */\n"; t << "</script>\n"; if (!Config_getBool(DISABLE_INDEX)) diff --git a/src/searchindex.cpp b/src/searchindex.cpp index ec7f7d6..d9e5c99 100644 --- a/src/searchindex.cpp +++ b/src/searchindex.cpp @@ -956,7 +956,7 @@ void writeJavaScriptSearchIndex() QCString baseName; baseName.sprintf("%s_%x",g_searchIndexInfo[i].name.data(),p); - QCString fileName = searchDirName + "/"+baseName+".html"; + QCString fileName = searchDirName + "/"+baseName+Doxygen::htmlFileExtension; QCString dataFileName = searchDirName + "/"+baseName+".js"; QFile outFile(fileName); @@ -1268,7 +1268,7 @@ void writeJavaScriptSearchIndex() ResourceMgr::instance().copyResource("search.js",searchDirName); } { - QFile f(searchDirName+"/nomatches.html"); + QFile f(searchDirName+"/nomatches"+Doxygen::htmlFileExtension); if (f.open(IO_WriteOnly)) { FTextStream t(&f); |