Skip to content

Commit 783d0ea

Browse files
committed
Merge branch 'hotfix/3.2.17' into hotfix/3.4.1
Conflicts: system/docs/CHANGELOG.md system/modules/core/dca/tl_style_sheet.php
2 parents 702de82 + d5fa56e commit 783d0ea

File tree

2 files changed

+18
-0
lines changed

2 files changed

+18
-0
lines changed

system/docs/CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ Remove the hardcoded figcaption width (see #7549).
2828
### Fixed
2929
Only load the model in the file/page picker if the class exists (see #7490).
3030

31+
### Fixed
32+
Romanize style sheet names (see #7526).
33+
3134
### Fixed
3235
Add the username to the "account has been locked" log entry (see #7551).
3336

system/modules/core/dca/tl_style_sheet.php

+15
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,10 @@
158158
'search' => true,
159159
'flag' => 1,
160160
'eval' => array('mandatory'=>true, 'unique'=>true, 'rgxp'=>'alnum', 'maxlength'=>64, 'spaceToUnderscore'=>true),
161+
'save_callback' => array
162+
(
163+
array('tl_style_sheet', 'romanizeName')
164+
),
161165
'sql' => "varchar(64) NULL"
162166
),
163167
'disablePie' => array
@@ -339,6 +343,17 @@ public function listStyleSheet($row)
339343
}
340344

341345

346+
/**
347+
* Romanize the file name (see #7526)
348+
* @param mixed
349+
* @return mixed
350+
*/
351+
public function romanizeName($varValue)
352+
{
353+
return utf8_romanize($varValue);
354+
}
355+
356+
342357
/**
343358
* Sanitize the conditional comments field
344359
* @param mixed

0 commit comments

Comments
 (0)