Skip to content
Snippets Groups Projects
Commit 15cb8e4e authored by Björn Schießle's avatar Björn Schießle
Browse files

only check for external mount points if the external storage app is enabled

parent ae30eb48
No related branches found
No related tags found
No related merge requests found
...@@ -1027,11 +1027,12 @@ class Util { ...@@ -1027,11 +1027,12 @@ class Util {
} }
// check if it is a group mount // check if it is a group mount
$mount = \OC_Mount_Config::getSystemMountPoints(); if (\OCP\App::isEnabled("files_external")) {
foreach ($mount as $mountPoint => $data) { $mount = \OC_Mount_Config::getSystemMountPoints();
if ($mountPoint == substr($ownerPath, 1, strlen($mountPoint))) { foreach ($mount as $mountPoint => $data) {
$userIds = array_merge($userIds, if ($mountPoint == substr($ownerPath, 1, strlen($mountPoint))) {
$this->getUserWithAccessToMountPoint($data['applicable']['users'], $data['applicable']['groups'])); $userIds = array_merge($userIds, $this->getUserWithAccessToMountPoint($data['applicable']['users'], $data['applicable']['groups']));
}
} }
} }
...@@ -1567,10 +1568,12 @@ class Util { ...@@ -1567,10 +1568,12 @@ class Util {
* @return boolean * @return boolean
*/ */
public function isSystemWideMountPoint($path) { public function isSystemWideMountPoint($path) {
$mount = \OC_Mount_Config::getSystemMountPoints(); if (\OCP\App::isEnabled("files_external")) {
foreach ($mount as $mountPoint => $data) { $mount = \OC_Mount_Config::getSystemMountPoints();
if ($mountPoint == substr($path, 1, strlen($mountPoint))) { foreach ($mount as $mountPoint => $data) {
return true; if ($mountPoint == substr($path, 1, strlen($mountPoint))) {
return true;
}
} }
} }
return false; return false;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment