Merge branch 'CRM_14.0' into debug

controllers/help_doc/doc.go

@@ -243,6 +243,7 @@ func (this *HelpDocController) ListReport() {
 	parentMap := make(map[int]int)
 	classifyNameMap := make(map[int]string)
 	for _, v := range classifyAll {
+		classifyNameMap[v.ClassifyId] = v.ClassifyName
 		if v.ParentId != 0 {
 			parentMap[v.ClassifyId] = v.ParentId
 		}