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

CHANGELOG.md

@@ -9,6 +9,7 @@
 - Fixed a bug where native fields (e.g. Title) were showing changed statuses when viewing revisions, if they had been updated since the time the revision was created.
 - Fixed a bug where eager-loading element queries could create an excessive amount of cache invalidation tags.
 - Fixed a bug where it was possible to enable elements for new sites with validation errors. ([#16505](https://github.com/craftcms/cms/issues/16505))
+- Fixed a bug where ʻokina characters weren’t being removed in auto-generated slugs. ([#16548](https://github.com/craftcms/cms/issues/16548))
 - Added a `cp.login.alternative-login-methods` hook to the system login template.
 - Fixed a bug where Color fields’ custom color inputs were including presets based on the color palette.
 - Fixed a bug where nested Matrix entries weren’t getting assigned a post date if they were created while saving the owner element with a custom validation scenario. ([#16504](https://github.com/craftcms/cms/pull/16504))

src/helpers/ElementHelper.php

@@ -107,7 +107,7 @@ public static function normalizeSlug(string $slug): string
         $slug = StringHelper::stripHtml($slug);
 
         // Remove inner-word punctuation
-        $slug = preg_replace('/[\'"‘’“”\[\]\(\)\{\}:]/u', '', $slug);
+        $slug = preg_replace('/[\'"‘’“”ʻ\[\]\(\)\{\}:]/u', '', $slug);
 
         // Make it lowercase
         $generalConfig = Craft::$app->getConfig()->getGeneral();

src/helpers/StringHelper.php

@@ -1798,7 +1798,7 @@ public static function toWords(string $str, bool $lower = false, bool $removePun
         }
 
         // Remove inner-word punctuation.
-        $str = preg_replace('/[\'"‘’“”\[\]\(\)\{\}:]/u', '', $str);
+        $str = preg_replace('/[\'"‘’“”ʻ\[\]\(\)\{\}:]/u', '', $str);
 
         // Split on the words and return
         return static::splitOnWords($str);
@@ -1817,7 +1817,7 @@ public static function toHandle(string $str): string
         $handle = static::stripHtml($str);
 
         // Remove inner-word punctuation
-        $handle = preg_replace('/[\'"‘’“”\[\]\(\)\{\}:]/', '', $handle);
+        $handle = preg_replace('/[\'"‘’“”ʻ\[\]\(\)\{\}:]/', '', $handle);
 
         // Make it lowercase
         $handle = static::toLowerCase($handle);

src/web/assets/cp/src/js/EnvVarGenerator.js

@@ -9,7 +9,7 @@ Craft.EnvVarGenerator = Craft.BaseInputGenerator.extend({
     let name = sourceVal.replace(/<(.*?)>/g, '');
 
     // Remove inner-word punctuation
-    name = name.replace(/['"‘’“”\[\]\(\)\{\}:]/g, '');
+    name = name.replace(/['"‘’“”ʻ\[\]\(\)\{\}:]/g, '');
 
     // Make it lowercase
     name = name.toLowerCase();

src/web/assets/cp/src/js/HandleGenerator.js

@@ -9,7 +9,7 @@ Craft.HandleGenerator = Craft.BaseInputGenerator.extend({
     var handle = sourceVal.replace(/<(.*?)>/g, '');
 
     // Remove inner-word punctuation
-    handle = handle.replace(/['"‘’“”\[\]\(\)\{\}:]/g, '');
+    handle = handle.replace(/['"‘’“”ʻ\[\]\(\)\{\}:]/g, '');
 
     // Make it lowercase
     handle = handle.toLowerCase();

src/web/assets/cp/src/js/SlugGenerator.js

@@ -9,7 +9,7 @@ Craft.SlugGenerator = Craft.BaseInputGenerator.extend({
     sourceVal = sourceVal.replace(/<(.*?)>/g, '');
 
     // Remove inner-word punctuation
-    sourceVal = sourceVal.replace(/['"‘’“”\[\]\(\)\{\}:]/g, '');
+    sourceVal = sourceVal.replace(/['"‘’“”ʻ\[\]\(\)\{\}:]/g, '');
 
     if (Craft.limitAutoSlugsToAscii) {
       // Convert extended ASCII characters to basic ASCII