version 1.4.12

craftcms · Jul 5, 2016 · de987d4 · de987d4
1 parent 3141168
commit de987d4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/changelog.json b/changelog.json
@@ -1,4 +1,15 @@
 [
+    {
+        "version": "1.4.12",
+        "downloadUrl": "https://github.com/engram-design/FeedMe/archive/1.4.12.zip",
+        "date": "2016-07-06T01:00:00+10:00",
+        "notes": [
+            "[Improved] Altered terminology around Duplication Handling to hopefully be more clearer.",
+            "[Fixed] Protect against errors on Feed Me index page when sections/entry types no longer exist.",
+            "[Fixed] Fixed mapping issues with Table field inside Matrix blocks.",
+            "[Fixed] Fixed Dropdown field matching via Label, not Value."
+        ]
+    },
     {
         "version": "1.4.11",
         "downloadUrl": "https://github.com/engram-design/FeedMe/archive/1.4.11.zip",

diff --git a/feedme/FeedMePlugin.php b/feedme/FeedMePlugin.php
@@ -24,7 +24,7 @@ public function getName()
 
     public function getVersion()
     {
-        return '1.4.11';
+        return '1.4.12';
     }
 
     public function getSchemaVersion()

diff --git a/feedme/templates/feeds/index.html b/feedme/templates/feeds/index.html
@@ -43,7 +43,7 @@
                         <td>
                             {% if section | length > 0 %}
                                 {% set entryTypes = section.getEntryTypes('id') %}
-                                {{ entryTypes[feed.entrytype].name }}
+                                {{ (entryTypes[feed.entrytype] is defined) ? entryTypes[feed.entrytype].name }}
                             {% endif %}
                         </td>
                         <td>{{ feed.duplicateHandle | capitalize }}</td>