Fixed #4096

Signed-off-by: brandonkelly <[email protected]>
craftcms · Apr 4, 2019 · 6f6fc9e · 6f6fc9e
1 parent 38c1dbc
commit 6f6fc9e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG-v3.md b/CHANGELOG-v3.md
@@ -1,5 +1,10 @@
 # Release Notes for Craft CMS 3.x
 
+## 3.1.21.1 - 2019-04-04
+
+### Fixed
+- Fixed a bug where underscores were getting stripped from element slugs. ([#4096](https://github.com/craftcms/cms/issues/4096))
+
 ## 3.1.21 - 2019-04-03
 
 ### Added

diff --git a/src/helpers/StringHelper.php b/src/helpers/StringHelper.php
@@ -11,7 +11,6 @@
 use Stringy\Stringy as BaseStringy;
 use yii\base\Exception;
 use yii\base\InvalidConfigException;
-use yii\helpers\Inflector;
 
 /**
  * This helper class provides various multi-byte aware string related manipulation and encoding methods.
@@ -1071,7 +1070,8 @@ public static function replaceMb4(string $string, $replace): string
     public static function toWords(string $string, bool $lower = false, bool $removePunctuation = false): array
     {
         // Convert CamelCase to multiple words
-        $string = Inflector::camel2words($string, false);
+        // Regex copied from Inflector::camel2words(), but without dropping punctuation
+        $string = preg_replace('/(?<!\p{Lu})(\p{Lu})|(\p{Lu})(?=\p{Ll})/u', ' \0', $string);
 
         if ($lower) {
             // Make it lowercase