aboutsummaryrefslogtreecommitdiffstats
path: root/include/import.php
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-04-10 16:56:08 -0700
committerredmatrix <git@macgirvin.com>2016-04-10 16:56:08 -0700
commitabfbe9c9375c7505e0422b8adc1d9d5426d7df1a (patch)
tree5fdc9b9b7edbc4f73fd36cfde9d905e335089cb9 /include/import.php
parentc0bdcfedeb8c5b8753587ac77d5b90d48698ec66 (diff)
downloadvolse-hubzilla-abfbe9c9375c7505e0422b8adc1d9d5426d7df1a.tar.gz
volse-hubzilla-abfbe9c9375c7505e0422b8adc1d9d5426d7df1a.tar.bz2
volse-hubzilla-abfbe9c9375c7505e0422b8adc1d9d5426d7df1a.zip
a few issues: block public not blocking mod_cal, typo in sql for one clone file sync operation, fix_system_urls not catching cached contact photos, extend sessionhandler expiration when remember_me is enabled as the stored session is expiring long before the browser session.
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 f15dedfe0..3b5c8508c 100644
--- a/include/import.php
+++ b/include/import.php
@@ -925,7 +925,7 @@ 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' ",
dbesc($basename . $ext),
dbesc($basename . '(%)' . $ext),
dbesc($att['folder']),