harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

put cloud back in get_cloudpath - just have to be careful where we use it.

Browse Source
This commit is contained in:
friendica 2015-01-19 14:31:45 -08:00
parent 2372d9b42a
commit ec6e147935
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/attach.php
View File

@ -811,6 +811,7 @@ function attach_delete($channel_id, $resource) {
/** /**
* @brief Returns path to file in cloud/. * @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 * @param array
* $arr[uid] int the channels uid * $arr[uid] int the channels uid
@ -820,7 +821,7 @@ function attach_delete($channel_id, $resource) {
* path to the file in cloud/ * path to the file in cloud/
*/ */
function get_cloudpath($arr) { function get_cloudpath($arr) {
$basepath = get_app()->module . '/'; $basepath = 'cloud/';
if($arr['uid']) { if($arr['uid']) {
$r = q("select channel_address from channel where channel_id = %d limit 1", $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/. * @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 * @param int $channel_id
* The id of the channel * The id of the channel
@ -880,7 +882,7 @@ function get_parent_cloudpath($channel_id, $channel_name, $attachHash) {
$parentFullPath = $parentName . '/' . $parentFullPath; $parentFullPath = $parentName . '/' . $parentFullPath;
} }
} while ($parentHash); } while ($parentHash);
$parentFullPath = z_root() . '/' . get_app()->module . '/' . $channel_name . '/' . $parentFullPath; $parentFullPath = z_root() . '/cloud/' . $channel_name . '/' . $parentFullPath;
return $parentFullPath; return $parentFullPath;
} }

2
version.inc
View File

@ -1 +1 @@
2015-01-16.920 2015-01-19.921