Merge branch 'dev' of https://framagit.org/hubzilla/core into dev

2019-06-26 21:54:50 -07:00
parent cf844cb27c 5ccef18d4e
commit d83ce0863a
53 changed files with 18115 additions and 33967 deletions
--- a/include/import.php
+++ b/include/import.php
@@ -1392,7 +1392,7 @@ function sync_files($channel, $files) {
 						$p['content'] = (($p['content'])? base64_decode($p['content']) : '');
 					}

-					if (intval($p['imgscale']) && ((intval($p['os_storage'])) || (! $p['content']))) {
+					if(intval($p['imgscale'])) {

 						$time = datetime_convert();