hitsword
/
fastadmin
mirror of https://gitee.com/karson/fastadmin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

!25 修复windows和unix换行符不同引起的JS、CSS打包压缩失败问题 

Merge pull request !25 from 常乐/master
pull/524927/MERGE
Karson 2017-11-22 12:24:08 +08:00
parent 225fcfc61b 0a44858c89
commit a197664a6e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/admin/command/Min.php
View File

@ -102,7 +102,7 @@ class Min extends Command
if ($res == "js")
{
$content = file_get_contents($from);
preg_match("/require\.config\(\{[\n]+(.*?)\n\}\);/is", $content, $matches);
preg_match("/require\.config\(\{[\r\n]?[\n]?+(.*?)[\r\n]?[\n]?}\);/is", $content, $matches);
if (!isset($matches[1]))
{
$output->error("js config not found!");