diff options
author | Max Kostikov <max@kostikov.co> | 2019-06-21 23:26:12 +0200 |
---|---|---|
committer | Max Kostikov <max@kostikov.co> | 2019-06-21 23:26:12 +0200 |
commit | 1b6fbe3a2e430205ebc92dff4c1bd14b9f903572 (patch) | |
tree | cb3968f9c6cf415aba7bdd38873003854c3e9027 /include/import.php | |
parent | 3dd6499ac4bfbb7ef52ba3a224ec7a35ff481a48 (diff) | |
parent | b1b415ec5b46f56a335a31527c9f987854be7282 (diff) | |
download | volse-hubzilla-1b6fbe3a2e430205ebc92dff4c1bd14b9f903572.tar.gz volse-hubzilla-1b6fbe3a2e430205ebc92dff4c1bd14b9f903572.tar.bz2 volse-hubzilla-1b6fbe3a2e430205ebc92dff4c1bd14b9f903572.zip |
Merge branch 'dev' into 'dev'
Fix thumbnails processing logic on files sync
See merge request hubzilla/core!1682
Diffstat (limited to 'include/import.php')
-rw-r--r-- | include/import.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/import.php b/include/import.php index 24ad1b901..caf25f5d2 100644 --- a/include/import.php +++ b/include/import.php @@ -1390,7 +1390,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(); |