aboutsummaryrefslogtreecommitdiffstats
path: root/include/import.php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-06-07 20:28:59 -0700
committerzotlabs <mike@macgirvin.com>2017-06-07 20:28:59 -0700
commit2e692fca93158748f99eab651bd0782b27044b8d (patch)
tree76fbc72f3af8f46a17995299bd60fecebe89deed /include/import.php
parent9dbd99714186ac5ea008e8e17e12be5076e8553f (diff)
downloadvolse-hubzilla-2e692fca93158748f99eab651bd0782b27044b8d.tar.gz
volse-hubzilla-2e692fca93158748f99eab651bd0782b27044b8d.tar.bz2
volse-hubzilla-2e692fca93158748f99eab651bd0782b27044b8d.zip
partial fix for failure to sync photos - appears to be memory exhaustion and dependent on filesize although an unrelated issue was found with directory creation during file sync (we didn't check ownership when looking for duplicates).
This checkin provides the means for a sync process to fetch the contents for various photo scales from the original server just as is done for the attach data now. It is still missing the bit for the sync process to spawn a mob of children to fetch these suckers and update the photo table with the results.
Diffstat (limited to 'include/import.php')
-rw-r--r--include/import.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/import.php b/include/import.php
index f219bc780..a8a70a5f2 100644
--- a/include/import.php
+++ b/include/import.php
@@ -1084,11 +1084,12 @@ function sync_files($channel, $files) {
$ext = '';
}
- $r = q("select filename from attach where ( filename = '%s' OR filename like '%s' ) and folder = '%s' and hash != '%s' ",
+ $r = q("select filename from attach where ( filename = '%s' OR filename like '%s' ) and folder = '%s' and hash != '%s' and uid = %d ",
dbesc($basename . $ext),
dbesc($basename . '(%)' . $ext),
dbesc($att['folder']),
- dbesc($att['hash'])
+ dbesc($att['hash']),
+ intval($channel['channel_id'])
);
if($r) {