Merge pull request #26 from symphonists/integration

Version 2.1.1
symphonists · Sep 4, 2013 · 72d150c · 72d150c
2 parents 1cf6858 + db2d192
commit 72d150c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/extension.meta.xml b/extension.meta.xml
@@ -22,6 +22,10 @@
 		</author>
 	</authors>
 	<releases>
+		<release version="2.1.1" date="2013-09-04" min="2.3.1">
+			- Update modification date on import
+			- Fix string handling
+		</release>
 		<release version="2.1" date="2013-05-27" min="2.3.1">
 			- Added support for the `ImportableField` interface
 			- Added logging for when errors occur
@@ -50,4 +54,4 @@
 			- Initial beta release for Symphony 2.0.7.
 		</release>
 	</releases>
-</extension>
+</extension>
diff --git a/lib/class.xmlimporter.php b/lib/class.xmlimporter.php
@@ -263,7 +263,7 @@ function handleXMLError($errno, $errstr, $errfile, $errline, $context) {
 							$value = $value[0];
 						}
 
-						else {
+						else if (is_array($value)) {
 							$value = implode('', $value);
 						}
 					}
@@ -292,6 +292,8 @@ function handleXMLError($errno, $errstr, $errfile, $errline, $context) {
 		public function commit() {
 			$options = $this->options();
 			$existing = array();
+			$modificationDate = DateTimeObj::get('Y-m-d H:i:s');
+			$modificationDateGmt = DateTimeObj::getGMT('Y-m-d H:i:s');
 
 			$section = SectionManager::fetch($options['section']);
 
@@ -331,6 +333,8 @@ public function commit() {
 					if ($options['can-update'] == 'yes') {
 						$entry->set('id', $existing[$index]);
 						$entry->set('importer_status', 'updated');
+						$entry->set('modification_date', $modificationDate);
+						$entry->set('modification_date_gmt', $modificationDateGmt);
 					}
 
 					// Skip