Browse Source

修复Asset::require传递参数的值为空时加载异常问题

jqh 4 years ago
parent
commit
4cd29a41af
1 changed files with 4 additions and 2 deletions
  1. 4 2
      src/Layout/Asset.php

+ 4 - 2
src/Layout/Asset.php

@@ -368,7 +368,9 @@ class Asset
 
         foreach ($files as &$file) {
             foreach ($params as $k => $v) {
-                $file = str_replace("{{$k}}", $v, $file);
+                if ($v !== '' && $v !== null) {
+                    $file = str_replace("{{$k}}", $v, $file);
+                }
             }
         }
 
@@ -409,7 +411,7 @@ class Asset
     {
         if (is_array($alias)) {
             foreach ($alias as $v) {
-                $this->require($v);
+                $this->require($v, $params);
             }
 
             return;