diff options
| author | friendica <info@friendica.com> | 2015-01-19 14:31:45 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-19 14:31:45 -0800 |
| commit | ec6e147935b90b4f37a17fb8c7d21cfb250b1546 (patch) | |
| tree | 609b3074d30cf7f6a7de2389d174a0d9870e7203 | |
| parent | 2372d9b42a04ddc2e46eec101385b3fce48ade55 (diff) | |
| download | volse-hubzilla-ec6e147935b90b4f37a17fb8c7d21cfb250b1546.tar.gz volse-hubzilla-ec6e147935b90b4f37a17fb8c7d21cfb250b1546.tar.bz2 volse-hubzilla-ec6e147935b90b4f37a17fb8c7d21cfb250b1546.zip | |
put cloud back in get_cloudpath - just have to be careful where we use it.
| -rw-r--r-- | include/attach.php | 6 | ||||
| -rw-r--r-- | version.inc | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/include/attach.php b/include/attach.php index dd4f89d09..5ef3bea24 100644 --- a/include/attach.php +++ b/include/attach.php @@ -811,6 +811,7 @@ function attach_delete($channel_id, $resource) { /** * @brief Returns path to file in cloud/. + * This function cannot be used with mod/dav as it always returns a path valid under mod/cloud * * @param array * $arr[uid] int the channels uid @@ -820,7 +821,7 @@ function attach_delete($channel_id, $resource) { * path to the file in cloud/ */ function get_cloudpath($arr) { - $basepath = get_app()->module . '/'; + $basepath = 'cloud/'; if($arr['uid']) { $r = q("select channel_address from channel where channel_id = %d limit 1", @@ -862,6 +863,7 @@ function get_cloudpath($arr) { /** * @brief Returns path to parent folder in cloud/. + * This function cannot be used with mod/dav as it always returns a path valid under mod/cloud * * @param int $channel_id * The id of the channel @@ -880,7 +882,7 @@ function get_parent_cloudpath($channel_id, $channel_name, $attachHash) { $parentFullPath = $parentName . '/' . $parentFullPath; } } while ($parentHash); - $parentFullPath = z_root() . '/' . get_app()->module . '/' . $channel_name . '/' . $parentFullPath; + $parentFullPath = z_root() . '/cloud/' . $channel_name . '/' . $parentFullPath; return $parentFullPath; } diff --git a/version.inc b/version.inc index 2e85b3d8f..c376f4189 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-01-16.920 +2015-01-19.921 |