Merge branch '5.x' of https://github.com/craftcms/cms into 6.x

# Conflicts:
#	CHANGELOG.md
#	bootstrap/bootstrap.php
#	src/elements/Entry.php
#	src/helpers/Html.php
#	src/helpers/HtmlPurifier.php
#	tests/unit/helpers/HtmlHelperTest.php

Author: brandonkelly

src/Entry/Elements/Entry.php

@@ -2768,14 +2768,17 @@ protected function partialTemplatePathCandidates(): array
         $entryType = $this->getType();
 
         if (isset($entryType->original) && $entryType->original->handle !== $entryType->handle) {
-            $templates[] = [
-                'template' => sprintf(
-                    '%s/%s/%s',
-                    Cms::config()->partialTemplatesPath,
-                    self::refHandle(),
-                    $entryType->original->handle,
-                ),
-                'priority' => 5,
+            return [
+                [
+                    'template' => sprintf(
+                        '%s/%s/%s',
+                        Cms::config()->partialTemplatesPath,
+                        self::refHandle(),
+                        $entryType->original->handle,
+                    ),
+                    'priority' => 5,
+                ],
+                ...$templates,
             ];
         }
 

src/Support/Html.php

@@ -992,6 +992,7 @@ function (array $match) use ($namespace, $ids): string {
                 foreach ($matchIds as $i => $id) {
                     if (
                         $i % 2 === 0 && // not a delimiter
+                        $id !== '' && // check if it's not an empty string, or the next line will error
                         $id[0] !== '.' // not a class name
                     ) {
                         $isHash = $id[0] === '#';

tests/Unit/Support/HtmlTest.php

@@ -390,6 +390,8 @@ function normalizeParseTagInfo(array $info): array
     ['<div id="foo-bar"></div><div data-reverse-target="#foo-bar, #foo-bar .foo"></div>', '<div id="bar"></div><div data-reverse-target="#bar, #bar .foo"></div>', 'foo', false],
     ['<div id="foo-bar"></div><div data-target-prefix="#foo-"></div>', '<div id="bar"></div><div data-target-prefix="#"></div>', 'foo', false],
     ['<div id="foo-bar"></div><div data-target-prefix></div>', '<div id="bar"></div><div data-target-prefix></div>', 'foo', false],
+    // https://github.com/craftcms/cms/issues/18957
+    ['<div for=" "></div>', '<div for=" "></div>', 'foo', false],
 ]);
 
 test('Widont', function (string $expected, string $string): void {

yii2-adapter/legacy/helpers/HtmlPurifier.php

@@ -80,6 +80,9 @@ public static function configure($config): void
         $config->set('Attr.DefaultImageAlt', '');
         $config->set('Attr.DefaultInvalidImageAlt', '');
 
+        // allow HTML5 ID attributes by default
+        $config->set('Attr.ID.HTML5', true);
+
         // Add support for some HTML5 elements
         // see https://github.com/mewebstudio/Purifier/issues/32#issuecomment-182502361
         // see https://gist.github.com/lluchs/3303693