From de987d4722abe397f5c4c9e519e79efab260fdd3 Mon Sep 17 00:00:00 2001
From: Josh Crawford <joshua@sgroup.com.au>
Date: Wed, 6 Jul 2016 00:13:37 +1000
Subject: [PATCH] version 1.4.12

---
 changelog.json                    | 11 +++++++++++
 feedme/FeedMePlugin.php           |  2 +-
 feedme/templates/feeds/index.html |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/changelog.json b/changelog.json
index c4a174e3..a667ca02 100644
--- 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
index aa159aae..eec0c4f8 100644
--- 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
index b2aa175d..956a7e9a 100644
--- 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>