aboutsummaryrefslogtreecommitdiffstats
path: root/include/import.php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2019-06-26 21:54:50 -0700
committerzotlabs <mike@macgirvin.com>2019-06-26 21:54:50 -0700
commitd83ce0863abaf448b64c550999e070376fd71b71 (patch)
treea0f0b45249487bd471bcf0545dfbb23f7b871623 /include/import.php
parentcf844cb27c02c3aae636eb1aa1587b1d5e3e81a0 (diff)
parent5ccef18d4e5b7901f78a11e0124c16e1c484e3bf (diff)
downloadvolse-hubzilla-d83ce0863abaf448b64c550999e070376fd71b71.tar.gz
volse-hubzilla-d83ce0863abaf448b64c550999e070376fd71b71.tar.bz2
volse-hubzilla-d83ce0863abaf448b64c550999e070376fd71b71.zip
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'include/import.php')
-rw-r--r--include/import.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/import.php b/include/import.php
index 1843c9741..1d3b7c035 100644
--- 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();