Merge branch 'integration' of github.com:symphonists/xmlimporter into…

… integration
jude86-7 · May 27, 2013 · 2ef9d60 · 2ef9d60
2 parents 365e311 + 672f604
commit 2ef9d60
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/assets/xmlimporter.js b/assets/xmlimporter.js
@@ -18,4 +18,4 @@
 		}).trigger('change.xmlimporter');
 	});
 
-})(jQuery.noConflict());		
+})(jQuery);
diff --git a/content/content.importers.php b/content/content.importers.php
@@ -184,7 +184,12 @@ public function __viewRun() {
 						$xml->preserveWhiteSpace = false;
 						$xml->formatOutput = true;
 
-						$xml->loadXML($entry->ownerDocument->saveXML($entry));
+						if(is_null($entry->ownerDocument)) {
+							$xml->loadXML($entry->saveXML());
+						}
+						else {
+							$xml->loadXML($entry->ownerDocument->saveXML($entry));
+						}
 
 						$source = htmlentities($xml->saveXML($xml->documentElement), ENT_COMPAT, 'UTF-8');
 

diff --git a/lib/class.xmlimporter.php b/lib/class.xmlimporter.php
@@ -220,8 +220,13 @@ function handleXMLError($errno, $errstr, $errfile, $errline, $context) {
 				foreach ($current['values'] as $field_id => $value) {
 					$field = FieldManager::fetch($field_id);
 
-					if(is_array($value) && count($value) === 1) {
-						$value = current($value);
+					if(is_array($value)) {
+						if(count($value) === 1) {
+							$value = current($value);
+						}
+						if(count($value) === 0) {
+							$value = '';
+						}
 					}
 
 					// Adjust value?