Merge pull request #8203 from albert-github/feature/bug_xhtml_search

Default doxygen search mechanism doesn't work when using with XHTML output

2 files changed, 5 insertions, 5 deletions

diff --git a/templates/html/htmlsearchresult.tpl b/templates/html/htmlsearchresult.tpl
index 4e15414..139faf2 100644
--- a/templates/html/htmlsearchresult.tpl
+++ b/templates/html/htmlsearchresult.tpl
@@ -11,14 +11,14 @@
 <div id="SRIndex">
 <div class="SRStatus" id="Loading">{{ tr.loading }}</div>
 <div id="SRResults"></div>
-<script type="text/javascript"><!--
+<script type="text/javascript">
 /* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&dn=gpl-2.0.txt GPL-v2 */
 createResults();
 /* @license-end */
---></script>
+</script>
 <div class="SRStatus" id="Searching">{{ tr.searching }}</div>
 <div class="SRStatus" id="NoMatches">{{ tr.noMatches }}</div>
-<script type="text/javascript"><!--
+<script type="text/javascript">
 /* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&dn=gpl-2.0.txt GPL-v2 */
 document.getElementById("Loading").style.display="none";
 document.getElementById("NoMatches").style.display="none";
@@ -31,7 +31,7 @@ window.addEventListener("message", function(event) {
   }
 });
 /* @license-end */
---></script>
+</script>
 </div>
 </body>
 </html>
diff --git a/templates/html/search.js b/templates/html/search.js
index f591fd6..77ee7ab 100644
--- a/templates/html/search.js
+++ b/templates/html/search.js
@@ -355,7 +355,7 @@ function SearchBox(name, resultsPath, inFrame, label, extension)
     }
     else // nothing available for this search term
     {
-       resultsPage = this.resultsPath + '/nomatches.html';
+       resultsPage = this.resultsPath + '/nomatches' + this.extension;
        resultsPageWithSearch = resultsPage;
        hasResultsPage = false;
     }