Home Explore Help
Register Sign In
wangjunyun
/
Dcat-Admin
mirror of https://gitee.com/jqhph/dcat-admin.git
1
0
Fork 0
Files Issues 0 Wiki
Browse Source

Merge remote-tracking branch 'origin/2.0' into 2.0

jqh 4 years ago
parent
854854803c 1581cc3341
commit
7c22fb1873
2 changed files with 2 additions and 2 deletions
Unified View Show Diff Stats
  1. 1 1
      src/Admin.php
  2. 1 1
      src/Support/Setting.php

+ 1 - 1
src/Admin.php
View File 

@@ -30,7 +30,7 @@ class Admin
 
     use HasAssets;
 
     use HasAssets;
 
     use HasHtml;
 
     use HasHtml;
 
 
 
-    const VERSION = '2.0.18-beta';
 
+    const VERSION = '2.0.19-beta';
 
 
 
     const SECTION = [
 
     const SECTION = [
 
         // 往 <head> 标签内输入内容
 
         // 往 <head> 标签内输入内容

+ 1 - 1
src/Support/Setting.php
View File 

@@ -26,7 +26,7 @@ class Setting extends Fluent
 
             return [];
 
             return [];
 
         }
 
         }
 
 
 
-        return json_decode($value, true) ?: [];
 
+        return is_array($value) ? $value : (json_decode($value, true) ?: []);
 
     }
 
     }
 
 
 
     /**
 
     /**