aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2016-09-09 12:57:01 +0200
committerRoeland Jago Douma <roeland@famdouma.nl>2017-04-13 12:58:49 +0200
commit7dcc98eb202c089a2966004ffb988166f3c4e3d7 (patch)
treea21475a4f53feeea5f548e0135ee7da597d8ae3d
parentd84df155900bfdb58a8826802cde5a096065a078 (diff)
downloadnextcloud-server-7dcc98eb202c089a2966004ffb988166f3c4e3d7.tar.gz
nextcloud-server-7dcc98eb202c089a2966004ffb988166f3c4e3d7.zip
Add owner to access list
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
-rw-r--r--.htaccess4
-rw-r--r--lib/private/Share20/Manager.php2
-rw-r--r--tests/lib/Share20/ManagerTest.php2
3 files changed, 6 insertions, 2 deletions
diff --git a/.htaccess b/.htaccess
index 7bf8759e383..26be470fd10 100644
--- a/.htaccess
+++ b/.htaccess
@@ -78,3 +78,7 @@ Options -Indexes
<IfModule pagespeed_module>
ModPagespeed Off
</IfModule>
+#### DO NOT CHANGE ANYTHING ABOVE THIS LINE ####
+
+ErrorDocument 403 /core/templates/403.php
+ErrorDocument 404 /core/templates/404.php
diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php
index 127eef423ed..ce0444a76ba 100644
--- a/lib/private/Share20/Manager.php
+++ b/lib/private/Share20/Manager.php
@@ -1221,7 +1221,7 @@ class Manager implements IManager {
$path = $path->getParent();
}
- $users = [];
+ $users = [$owner => 'null'];
$public = false;
$remote = false;
foreach ($shares as $share) {
diff --git a/tests/lib/Share20/ManagerTest.php b/tests/lib/Share20/ManagerTest.php
index 20ba62fa225..bbdef2130f5 100644
--- a/tests/lib/Share20/ManagerTest.php
+++ b/tests/lib/Share20/ManagerTest.php
@@ -2811,7 +2811,7 @@ class ManagerTest extends \Test\TestCase {
->willReturn($userFolder);
$expected = [
- 'users' => ['user1', 'user2'],
+ 'users' => ['owner', 'user1', 'user2'],
'public' => true,
'remote' => true,
];