From 0a44858c89cf072ef264d4a8ab575f1854b5115e Mon Sep 17 00:00:00 2001
From: Chirs <showerlzy@gmail.com>
Date: Wed, 22 Nov 2017 11:38:51 +0800
Subject: [PATCH] 修复windows和unix换行符不同引起的JS、CSS打包压缩失败问题
---
application/admin/command/Min.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/application/admin/command/Min.php b/application/admin/command/Min.php
index de5be1b..d2fb4c6 100644
--- a/application/admin/command/Min.php
+++ b/application/admin/command/Min.php
@@ -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!");
--
libgit2 0.24.0