aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgit-marijus <mario@mariovavti.com>2017-07-30 19:46:52 +0200
committergit-marijus <mario@mariovavti.com>2017-07-31 02:54:27 +0200
commit3faca10efc09a2fb40cacffffda80c99fd6bace5 (patch)
treef6e380859eb6f7e618d51cc02d130f329b0acafb
parent280f52f007f00e0a8b2c910445bb54dfbf7275a0 (diff)
downloadvolse-hubzilla-3faca10efc09a2fb40cacffffda80c99fd6bace5.tar.gz
volse-hubzilla-3faca10efc09a2fb40cacffffda80c99fd6bace5.tar.bz2
volse-hubzilla-3faca10efc09a2fb40cacffffda80c99fd6bace5.zip
fix a bug where if multiple channels uploaded the same file to the same folder, the uploaded file would end up with an incremental number added to the filename for each upload even if the file did not exist yet in the channels folder
-rw-r--r--include/attach.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/attach.php b/include/attach.php
index 3a0c8b7ba..bd18b23f2 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -610,7 +610,8 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
// A freshly uploaded file. Check for duplicate and resolve with the channel's overwrite settings.
- $r = q("select filename, id, hash, filesize from attach where filename = '%s' and folder = '%s' ",
+ $r = q("select filename, id, hash, filesize from attach where uid = %d and filename = '%s' and folder = '%s' ",
+ intval($channel_id),
dbesc($filename),
dbesc($folder_hash)
);
@@ -632,7 +633,8 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
$ext = $def_extension;
}
- $r = q("select filename from attach where ( filename = '%s' OR filename like '%s' ) and folder = '%s' ",
+ $r = q("select filename from attach where uid = %d and ( filename = '%s' OR filename like '%s' ) and folder = '%s' ",
+ intval($channel_id),
dbesc($basename . $ext),
dbesc($basename . '(%)' . $ext),
dbesc($folder_hash)