Skip to content

Commit

Permalink
Fixed #2096
Browse files Browse the repository at this point in the history
  • Loading branch information
brandonkelly committed Nov 16, 2017
1 parent 69b12e4 commit cac58d6
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -9,6 +9,7 @@
### Fixed
- Fixed a bug where Craft would think that Rich Text field values had changed, even when they hadn’t, when leaving an edit page. ([#2098](https://github.com/craftcms/cms/issues/2098))
- Fixed a bug where Assets fields with large thumbnails were overlapping the following field in element editor HUDs. ([#1802](https://github.com/craftcms/cms/issues/1802))
- Fixed a bug where uppercase non-ASCII characters were not getting converted to their correct ASCII equivelants for element slugs, if the `limitAutoSlugsToAscii` config setting was enabled. ([#2096](https://github.com/craftcms/cms/issues/2096))

## 2.6.2997 - 2017-11-08

Expand Down
6 changes: 6 additions & 0 deletions src/helpers/ElementHelper.php
Expand Up @@ -37,6 +37,12 @@ public static function setValidSlug(BaseElementModel $element)
// Enforce the limitAutoSlugsToAscii config setting
if (craft()->config->get('limitAutoSlugsToAscii'))
{
if (!craft()->config->get('allowUppercaseInSlug'))
{
// Do this now because our ASCII character mappings are lowercase only.
$slug = mb_strtolower($slug);
}

$slug = StringHelper::asciiString($slug);
}
}
Expand Down

0 comments on commit cac58d6

Please sign in to comment.