Merge branch 'release/0.1.4'

corcel · Jan 19, 2017 · 8c0b89c · 8c0b89c
2 parents 580e085 + 8573bb2
commit 8c0b89c
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/Field/BasicField.php b/src/Field/BasicField.php
@@ -115,7 +115,10 @@ public function fetchFieldKey($fieldName)
      */
     public function fetchFieldType($fieldKey)
     {
-        $post = $this->post->where('post_name', $fieldKey)->first();
+        $post = $this->post->orWhere(function ($query) use ($fieldKey) {
+            $query->where('post_name', $fieldKey);
+            $query->where('post_type', 'acf-field');
+        })->first();
 
         if ($post) {
             $fieldData = unserialize($post->post_content);