!214 解决Config系统配置自定义类型字段定界符被修改后保存到数据库导致编辑后无法正常替换定界符得问题

Merge pull request !214 from Twhmr/master

application/admin/view/general/config/index.html

@@ -137,7 +137,7 @@
                                             <label for="row[{$item.name}]-no"><input id="row[{$item.name}]-no" name="row[{$item.name}]" type="radio" value="0" {$item.value?'':'checked'} data-tip="{$item.tip}" /> {:__('No')}</label>
                                             {/case}
                                             {case custom}
-                                            {$item.extend}
+                                            {$item.extend_html}
                                             {/case}
                                             {/switch}
                                         </div>

application/common/library/Token.php

@@ -108,7 +108,7 @@ class Token
      */
     public static function get($token, $default = false)
     {
-        return self::init()->get($token, $default);
+        return self::init()->get($token) ?: $default;
     }
 
     /**
@@ -148,7 +148,7 @@ class Token
     /**
      * 清除Token
      * @access public
-     * @param  string $token Token标记
+     * @param  int user_id 用户编号
      * @return boolean
      */
     public static function clear($user_id = null)

application/common/model/Config.php

@@ -19,6 +19,7 @@ class Config extends Model
     protected $updateTime = false;
     // 追加属性
     protected $append = [
+        'extend_html'
     ];
 
     /**
@@ -72,7 +73,7 @@ class Config extends Model
         return $regexList;
     }
 
-    public function getExtendAttr($value, $data)
+    public function getExtendHtmlAttr($value, $data)
     {
         $result = preg_replace_callback("/\{([a-zA-Z]+)\}/", function ($matches) use ($data) {
             if (isset($data[$matches[1]])) {