diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-05 16:54:39 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-05 16:54:39 +0100 |
| commit | 91f751d10531e73078f7efb4efa1f5e215a8f871 (patch) | |
| tree | bbe0b1b7fdd1c2c69a6ed2e001decc735111bc50 /include/attach.php | |
| parent | 07bd396837426fbe4cf3ecd189513d50a14081a1 (diff) | |
| parent | 0db5a8673d57088ab394cdaf372fb81dbd78bcbb (diff) | |
| download | volse-hubzilla-91f751d10531e73078f7efb4efa1f5e215a8f871.tar.gz volse-hubzilla-91f751d10531e73078f7efb4efa1f5e215a8f871.tar.bz2 volse-hubzilla-91f751d10531e73078f7efb4efa1f5e215a8f871.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/attach.php')
| -rw-r--r-- | include/attach.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/attach.php b/include/attach.php index 1bba88c63..8a568d8e1 100644 --- a/include/attach.php +++ b/include/attach.php @@ -722,7 +722,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) { intval($filesize), intval(1), intval($is_photo), - dbesc($os_relpath), + dbesc($os_basepath . $os_relpath), dbesc($created), intval($existing_id), intval($channel_id) @@ -742,7 +742,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) { intval($x[0]['revision'] + 1), intval(1), intval($is_photo), - dbesc($os_relpath), + dbesc($os_basepath . $os_relpath), dbesc($created), dbesc($created), dbesc($x[0]['allow_cid']), @@ -783,7 +783,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) { intval(0), intval(1), intval($is_photo), - dbesc($os_relpath), + dbesc($os_basepath . $os_relpath), dbesc($created), dbesc($created), dbesc(($arr && array_key_exists('allow_cid',$arr)) ? $arr['allow_cid'] : $str_contact_allow), |