fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-09 20:12:14 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix #1729 @import of external URL in concatenated CSS

Browse source
This commit is contained in:
Kijin Sung 2021-06-19 19:39:57 +09:00
parent 858b3f68b1
commit b01a148675
4 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
common/framework/formatter.php
View file

@ -339,6 +339,10 @@ class Formatter
$import_content = ''; $import_content = '';
$import_files = array_map(function($str) use($filename, $import_type) { $import_files = array_map(function($str) use($filename, $import_type) {
$str = trim(trim(trim(preg_replace('/^url\\(([^()]+)\\)$/', '$1', trim($str))), '"\'')); $str = trim(trim(trim(preg_replace('/^url\\(([^()]+)\\)$/', '$1', trim($str))), '"\''));
if (preg_match('!^(https?:)?//!i', $str))
{
return $str;
}
if ($import_type === 'scss') if ($import_type === 'scss')
{ {
if (($dirpos = strrpos($str, '/')) !== false) if (($dirpos = strrpos($str, '/')) !== false)
@ -367,10 +371,14 @@ class Formatter
}, explode(',', $matches[1])); }, explode(',', $matches[1]));
foreach ($import_files as $import_filename) foreach ($import_files as $import_filename)
{ {
if (file_exists($import_filename)) if (!preg_match('!^(https?:)?//!i', $import_filename) && file_exists($import_filename))
{ {
$import_content .= self::concatCSS($import_filename, $target_filename, false); $import_content .= self::concatCSS($import_filename, $target_filename, false);
} }
else
{
$import_content .= '@import url("' . escape_dqstr($import_filename) . '");';
}
} }
return trim($import_content); return trim($import_content);
}, $content); }, $content);

2
tests/_data/formatter/concat.source2.css
View file

@ -1,5 +1,7 @@
@charset "UTF-8"; @charset "UTF-8";
@import url(concat.source3.css); @import url(concat.source3.css);
@import url(//fonts.googleapis.com/earlyaccess/nanumgothic.css);
@import url('https://fonts.googleapis.com/css2?family=Noto+Sans+KR&display=swap');
.wordpress { .wordpress {
border-radius: 4px; border-radius: 4px;
} }

2
tests/_data/formatter/concat.target1.css
View file

@ -12,6 +12,8 @@
background-image: url("../_data/_data/formatter/test.jpg"); background-image: url("../_data/_data/formatter/test.jpg");
font-family: sans-serif; font-family: sans-serif;
} }
@import url("//fonts.googleapis.com/earlyaccess/nanumgothic.css");
@import url("https://fonts.googleapis.com/css2?family=Noto+Sans+KR&display=swap");
.wordpress { .wordpress {
border-radius: 4px; border-radius: 4px;
} }

2
tests/_data/formatter/concat.target2.css
View file

@ -16,6 +16,8 @@
background-image: url("../_data/_data/formatter/test.jpg"); background-image: url("../_data/_data/formatter/test.jpg");
font-family: sans-serif; font-family: sans-serif;
} }
@import url("//fonts.googleapis.com/earlyaccess/nanumgothic.css");
@import url("https://fonts.googleapis.com/css2?family=Noto+Sans+KR&display=swap");
.wordpress { .wordpress {
border-radius: 4px; border-radius: 4px;
} }