summaryrefslogtreecommitdiffstats
path: root/apps/files_encryption
diff options
context:
space:
mode:
authorFlorin Peter <github@florin-peter.de>2013-05-14 20:11:07 +0200
committerFlorin Peter <github@florin-peter.de>2013-05-14 20:11:07 +0200
commit517105660d334b21b2e4b83d4c00704d9a5d275d (patch)
treeb78cbb9318abde384311cbb5decfa10bac9234a1 /apps/files_encryption
parent81ae4cb5d07c1a7bf40a283bdb7e52c33dc243c6 (diff)
downloadnextcloud-server-517105660d334b21b2e4b83d4c00704d9a5d275d.tar.gz
nextcloud-server-517105660d334b21b2e4b83d4c00704d9a5d275d.zip
fix for public link share
Diffstat (limited to 'apps/files_encryption')
-rw-r--r--apps/files_encryption/lib/util.php2
-rwxr-xr-xapps/files_encryption/tests/share.php1
2 files changed, 1 insertions, 2 deletions
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 8f20481db6c..0233804160d 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -1096,7 +1096,7 @@ class Util {
// handle public access
if($fileOwnerUid === false && $this->isPublic) {
- $filename = $this->fileIdToPath( $GLOBALS['fileSource'] );
+ $filename = $path;
$fileOwnerUid = $GLOBALS['fileOwner'];
return array ( $fileOwnerUid, $filename );
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
index 850985c9f9f..b8433821d3b 100755
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
@@ -428,7 +428,6 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
// some hacking to simulate public link
$GLOBALS['app'] = 'files_sharing';
$GLOBALS['fileOwner'] = 'admin';
- $GLOBALS['fileSource'] = $fileInfo['fileid'];
\OC_User::setUserId('');
// get file contents