diff options
| author | zotlabs <mike@macgirvin.com> | 2017-03-25 13:07:46 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-03-25 13:07:46 -0700 |
| commit | 878614f97a9f8dc5e9f8ad2b5b10a85003084938 (patch) | |
| tree | 61459adfe8689901392b25ee432fbb8b3b2fb098 /Zotlabs/Module | |
| parent | a2e101997836ebd904e94aa896a1bcc2e2c70f01 (diff) | |
| download | volse-hubzilla-878614f97a9f8dc5e9f8ad2b5b10a85003084938.tar.gz volse-hubzilla-878614f97a9f8dc5e9f8ad2b5b10a85003084938.tar.bz2 volse-hubzilla-878614f97a9f8dc5e9f8ad2b5b10a85003084938.zip | |
get rid of 'davguest' and allow for project specific DB updates (currently db updates are common between all possible projects/subprojects/forks).
Diffstat (limited to 'Zotlabs/Module')
| -rw-r--r-- | Zotlabs/Module/Cloud.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Filestorage.php | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/Zotlabs/Module/Cloud.php b/Zotlabs/Module/Cloud.php index 2b6d7bcbe..7370eeda3 100644 --- a/Zotlabs/Module/Cloud.php +++ b/Zotlabs/Module/Cloud.php @@ -60,11 +60,9 @@ class Cloud extends \Zotlabs\Web\Controller { $_SERVER['QUERY_STRING'] = str_replace(array('?f=', '&f='), array('', ''), $_SERVER['QUERY_STRING']); $_SERVER['QUERY_STRING'] = strip_zids($_SERVER['QUERY_STRING']); - $_SERVER['QUERY_STRING'] = preg_replace('/[\?&]davguest=(.*?)([\?&]|$)/ism', '', $_SERVER['QUERY_STRING']); $_SERVER['REQUEST_URI'] = str_replace(array('?f=', '&f='), array('', ''), $_SERVER['REQUEST_URI']); $_SERVER['REQUEST_URI'] = strip_zids($_SERVER['REQUEST_URI']); - $_SERVER['REQUEST_URI'] = preg_replace('/[\?&]davguest=(.*?)([\?&]|$)/ism', '', $_SERVER['REQUEST_URI']); $rootDirectory = new \Zotlabs\Storage\Directory('/', $auth); diff --git a/Zotlabs/Module/Filestorage.php b/Zotlabs/Module/Filestorage.php index 874445145..785dff394 100644 --- a/Zotlabs/Module/Filestorage.php +++ b/Zotlabs/Module/Filestorage.php @@ -130,7 +130,7 @@ class Filestorage extends \Zotlabs\Web\Controller { $f = $r[0]; $channel = \App::get_channel(); - $cloudpath = get_cloudpath($f) . (intval($f['is_dir']) ? '?f=&davguest=1' : ''); + $cloudpath = get_cloudpath($f); $parentpath = get_parent_cloudpath($channel['channel_id'], $channel['channel_address'], $f['hash']); $aclselect_e = populate_acl($f, false, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_storage')); |