浏览代码

fix type order definition

Thomas 14 年之前
父节点
当前提交
b1ef03945d
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      Admin/FieldDescription.php

+ 2 - 2
Admin/FieldDescription.php

@@ -197,8 +197,8 @@ class FieldDescription
     {
         $this->fieldMapping = $fieldMapping;
 
-        $this->type      = $fieldMapping['type'];
-        $this->fieldName = $fieldMapping['fieldName'];
+        $this->type      = $this->type ?: $fieldMapping['type'];
+        $this->fieldName = $this->fieldName ?: $fieldMapping['fieldName'];
     }
 
     public function getFieldMapping()