summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2020-12-24 14:42:12 (GMT)
committerDimitri van Heesch <doxygen@gmail.com>2020-12-24 14:42:12 (GMT)
commitae4e0e0e55bbadc6621ba25a095eb90458ae818e (patch)
tree87529fe18be7dd5be4945d9b55264e3d8c3343e7
parent882af33aa84e11b777f1b79b680430504875a759 (diff)
downloadDoxygen-ae4e0e0e55bbadc6621ba25a095eb90458ae818e.zip
Doxygen-ae4e0e0e55bbadc6621ba25a095eb90458ae818e.tar.gz
Doxygen-ae4e0e0e55bbadc6621ba25a095eb90458ae818e.tar.bz2
issue #7471: [1.8.16 regression] multiple use of page label
-rw-r--r--src/util.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/util.cpp b/src/util.cpp
index c22d267..e4916cd 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -4919,10 +4919,14 @@ PageDef *addRelatedPage(const char *name,const QCString &ptitle,
{
PageDef *pd=0;
//printf("addRelatedPage(name=%s gd=%p)\n",name,gd);
+ QCString title=ptitle.stripWhiteSpace();
if ((pd=Doxygen::pageSDict->find(name)) && !tagInfo)
{
- if (!xref) warn(fileName,startLine,"multiple use of page label '%s', (other occurrence: %s, line: %d)",
+ if (!xref && !title.isEmpty() && pd->title()!=title)
+ {
+ warn(fileName,startLine,"multiple use of page label '%s', (other occurrence: %s, line: %d)",
name,pd->docFile().data(),pd->getStartBodyLine());
+ }
// append documentation block to the page.
pd->setDocumentation(doc,fileName,docLine);
//printf("Adding page docs '%s' pi=%p name=%s\n",doc.data(),pd,name);
@@ -4937,7 +4941,6 @@ PageDef *addRelatedPage(const char *name,const QCString &ptitle,
else if (baseName.right(Doxygen::htmlFileExtension.length())==Doxygen::htmlFileExtension)
baseName=baseName.left(baseName.length()-Doxygen::htmlFileExtension.length());
- QCString title=ptitle.stripWhiteSpace();
pd=createPageDef(fileName,docLine,baseName,doc,title);
pd->setBodySegment(startLine,startLine,-1);