Merge branch 'albert-github-feature/issue_12092'

doxygen · doxygen · commit 825c0c6b14ea · 2026-04-27T13:27:36.000+02:00
diff --git a/src/ftvhelp.cpp b/src/ftvhelp.cpp
@@ -556,15 +556,13 @@ static bool dupOfParent(const FTVNodePtr &n)
 static void generateJSLink(TextStream &t,const FTVNodePtr &n)
 {
   bool nameAsHtml = !n->nameAsHtml.isEmpty();
-  QCString result = nameAsHtml ? n->nameAsHtml : n->name;
-  QCString link = convertToJSString(result,nameAsHtml);
+  QCString link = nameAsHtml ? n->nameAsHtml : convertToJSString(n->name);
   if (n->file.isEmpty()) // no link
   {
     t << "\"" << link << "\", null, ";
   }
   else // link into other page
   {
-    if (Config_getBool(HIDE_SCOPE_NAMES)) result=stripScope(result);
     t << "\"" << link << "\", \"";
     t << externalRef("",n->ref,TRUE);
     t << node2URL(n);

Original file line number	Diff line number	Diff line change
`@@ -556,15 +556,13 @@ static bool dupOfParent(const FTVNodePtr &n)`
`556`	`556`	`static void generateJSLink(TextStream &t,const FTVNodePtr &n)`
`557`	`557`	`{`
`558`	`558`	`bool nameAsHtml = !n->nameAsHtml.isEmpty();`
`559`		`- QCString result = nameAsHtml ? n->nameAsHtml : n->name;`
`560`		`- QCString link = convertToJSString(result,nameAsHtml);`
	`559`	`+ QCString link = nameAsHtml ? n->nameAsHtml : convertToJSString(n->name);`
`561`	`560`	`if (n->file.isEmpty()) // no link`
`562`	`561`	`{`
`563`	`562`	`t << "\"" << link << "\", null, ";`
`564`	`563`	`}`
`565`	`564`	`else // link into other page`
`566`	`565`	`{`
`567`		`- if (Config_getBool(HIDE_SCOPE_NAMES)) result=stripScope(result);`
`568`	`566`	`t << "\"" << link << "\", \"";`
`569`	`567`	`t << externalRef("",n->ref,TRUE);`
`570`	`568`	`t << node2URL(n);`