diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-11-04 23:17:09 -0800 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-11-04 23:17:09 -0800 |
| commit | f8b612a2c04e947f18614f3e8a412a0bd6365b2e (patch) | |
| tree | f882e50dfe0ba74cf9fd6a7f36e25a6dde051189 /include/attach.php | |
| parent | f7468ab473f49b9594095d29a50f8e921d0b15af (diff) | |
| parent | 76043d97bd5d38e12ae84b18d48bc2dc4537ece0 (diff) | |
| download | volse-hubzilla-f8b612a2c04e947f18614f3e8a412a0bd6365b2e.tar.gz volse-hubzilla-f8b612a2c04e947f18614f3e8a412a0bd6365b2e.tar.bz2 volse-hubzilla-f8b612a2c04e947f18614f3e8a412a0bd6365b2e.zip | |
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
install/update.php
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), |