diff --git a/core/misc/machine-name.js b/core/misc/machine-name.js index 28f1b39ddf49863e760dd7443391cbf2d92b15fe..5e94d7d2f4cbf76243b7dfcb3abbb5b1e26f4cef 100644 --- a/core/misc/machine-name.js +++ b/core/misc/machine-name.js @@ -304,7 +304,6 @@ } slugify.config({ separator: settings.replace, - allowedChars: settings.replace_pattern, replace: normalizedLanguageOverrides, }); diff --git a/core/tests/Drupal/Nightwatch/Tests/machineNameTransliterationTest.js b/core/tests/Drupal/Nightwatch/Tests/machineNameTransliterationTest.js index 9241e7973daf313e8e1206e0ebf2e38d4bcbed24..465e1fa3c585288bd2c9d9978cac3369e1a8219b 100644 --- a/core/tests/Drupal/Nightwatch/Tests/machineNameTransliterationTest.js +++ b/core/tests/Drupal/Nightwatch/Tests/machineNameTransliterationTest.js @@ -26,7 +26,7 @@ const MachineNameTestArray = [ replacePattern: 'a-zA-Z0-9_.~@', replaceChar: '_', maxlength: 64, - expectedMachineName: 'bob@e_0', + expectedMachineName: 'bob_e_0', }, { machineName: 'Bobby', @@ -232,7 +232,7 @@ module.exports = { return Drupal.behaviors.machineName.transliterate( object.machineName, { - replace_pattern: object.replacePattern, + replace_pattern: `[^${object.replacePattern}]+`, replace: object.replaceChar, maxlength: object.maxlength, },