[4.0] html5 chrome fix [a11y] and markup (joomla#31772)

Co-authored-by: Quy <[email protected]>
bembelimen · Jan 1, 2021 · d55e7fa · d55e7fa
1 parent 95680f5
commit d55e7fa
Showing 1 changed file with 17 additions and 8 deletions.
diff --git a/layouts/chromes/html5.php b/layouts/chromes/html5.php
@@ -29,14 +29,23 @@
 $headerTag              = htmlspecialchars($params->get('header_tag', 'h3'), ENT_QUOTES, 'UTF-8');
 $headerClass            = htmlspecialchars($params->get('header_class', ''), ENT_QUOTES, 'UTF-8');
 $headerAttribs          = [];
-$headerAttribs['class'] = $headerClass;
-
-if ($module->showtitle) :
-	$moduleAttribs['aria-labelledby'] = 'mod-' . $module->id;
-	$headerAttribs['id']             = 'mod-' . $module->id;
-else:
-	$moduleAttribs['aria-label'] = $module->title;
-endif;
+
+// Only output a header class if one is set
+if ($headerClass !== '')
+{
+	$headerAttribs['class'] = $headerClass;
+}
+
+// Only add aria if the moduleTag is not a div
+if ($moduleTag !== 'div')
+{
+	if ($module->showtitle) :
+		$moduleAttribs['aria-labelledby'] = 'mod-' . $module->id;
+		$headerAttribs['id']              = 'mod-' . $module->id;
+	else:
+		$moduleAttribs['aria-label'] = $module->title;
+	endif;
+}
 
 $header = '<' . $headerTag . ' ' . ArrayHelper::toString($headerAttribs) . '>' . $module->title . '</' . $headerTag . '>';
 ?>