fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-07 02:31:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix #1926 add @charset UTF-8 to beginning of concatenated CSS file

Browse source
This commit is contained in:
Kijin Sung 2022-07-02 23:55:45 +09:00
parent 632a3fff71
commit e258cf7525
1 changed files with 776 additions and 774 deletions
Download patch file Download diff file Expand all files Collapse all files

4
classes/frontendfile/FrontEndFileHandler.class.php
View file

@ -485,7 +485,9 @@ class FrontEndFileHandler extends Handler
$concat_filename = self::$assetdir . '/combined/' . sha1(serialize($concat_files)) . '.css';
if (!file_exists(\RX_BASEDIR . $concat_filename) || filemtime(\RX_BASEDIR . $concat_filename) < $concat_max_timestamp)
{
Rhymix\Framework\Storage::write(\RX_BASEDIR . $concat_filename, Rhymix\Framework\Formatter::concatCSS($concat_files, $concat_filename));
$concat_content = Rhymix\Framework\Formatter::concatCSS($concat_files, $concat_filename);
$concat_content = '@charset "UTF-8";' . "\n\n" . preg_replace('/@charset\s*[\'"][a-z0-9-]+[\'"];\s*/i', '', $concat_content);
Rhymix\Framework\Storage::write(\RX_BASEDIR . $concat_filename, $concat_content);
}
$concat_filename .= '?' . date('YmdHis', filemtime(\RX_BASEDIR . $concat_filename));
$result[] = array('file' => \RX_BASEURL . $concat_filename, 'media' => 'all', 'targetie' => '');