Merge branch 'dev' into 'dev'

zot api changes to support combined content (items+files) import addon See merge request hubzilla/core!1533
2019-02-25 14:06:37 +01:00
parent 89bcb1de42 1ff97754af
commit 04b9216758
3 changed files with 92 additions and 23 deletions
--- a/include/text.php
+++ b/include/text.php
@@ -3246,7 +3246,7 @@ function flatten_array_recursive($arr) {
 				$ret = array_merge($ret, $tmp);
 			}
 		}
-		elseif($a) {
+		elseif(isset($a)) {
 			$ret[] = $a;
 		}
 	}