From 48d821628dae79cad659019b7112fe73619e665d Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Fri, 10 Nov 2017 04:13:36 +0200
Subject: [PATCH] Resolved gh-179 to unset fields that may not be in some DB's

---
 README.md                                 |  4 ++--
 admin/README.txt                          |  4 ++--
 admin/models/import_joomla_components.php | 22 +++++++++++++++++++++-
 componentbuilder.xml                      |  2 +-
 4 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index b570d43db..48330ff7a 100644
--- a/README.md
+++ b/README.md
@@ -111,11 +111,11 @@ Component Builder is mapped as a component in itself on my local development env
 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Component Builder](http://vdm.bz/component-builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 8th November, 2017
++ *Last Build*: 10th November, 2017
 + *Version*: 2.6.3
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-+ *Line count*: **159673**
++ *Line count*: **159693**
 + *File count*: **1002**
 + *Folder count*: **165**
 
diff --git a/admin/README.txt b/admin/README.txt
index b570d43db..48330ff7a 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -111,11 +111,11 @@ Component Builder is mapped as a component in itself on my local development env
 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Component Builder](http://vdm.bz/component-builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 8th November, 2017
++ *Last Build*: 10th November, 2017
 + *Version*: 2.6.3
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-+ *Line count*: **159673**
++ *Line count*: **159693**
 + *File count*: **1002**
 + *Folder count*: **165**
 
diff --git a/admin/models/import_joomla_components.php b/admin/models/import_joomla_components.php
index cd7af6fa0..607ab71f5 100644
--- a/admin/models/import_joomla_components.php
+++ b/admin/models/import_joomla_components.php
@@ -1233,7 +1233,27 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
 	**/
 	protected function prepItem($item, &$type, $action)
 	{
-		// actions to effect both
+		// remove access
+		if (isset($item->access))
+		{
+			unset($item->access);
+		}
+		// remove metadata
+		if (isset($item->metadata))
+		{
+			unset($item->metadata);
+		}
+		// remove metadesc
+		if (isset($item->metadesc))
+		{
+			unset($item->metadesc);
+		}
+		// remove metakey
+		if (isset($item->metakey))
+		{
+			unset($item->metakey);
+		}
+		// actions to effect all
 		if (isset($item->asset_id))
 		{
 			unset($item->asset_id);
diff --git a/componentbuilder.xml b/componentbuilder.xml
index 819acb11f..ed5a13ce7 100644
--- a/componentbuilder.xml
+++ b/componentbuilder.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>8th November, 2017</creationDate>
+	<creationDate>10th November, 2017</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>joomla@vdm.io</authorEmail>
 	<authorUrl>http://vdm.bz/component-builder</authorUrl>