diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-06-25 17:46:04 +0200 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-07-05 16:00:34 +0200 |
| commit | 15cb8e4efd5c7f74dc5f0336b0e0b5aba5a9d470 (patch) | |
| tree | fd9e6c4839284db460d04308666a96ed1b6aa3f2 | |
| parent | ae30eb48f26d5f7bf3f7cf83e9ef56ca9cdbcf3d (diff) | |
| download | nextcloud-server-15cb8e4efd5c7f74dc5f0336b0e0b5aba5a9d470.tar.gz nextcloud-server-15cb8e4efd5c7f74dc5f0336b0e0b5aba5a9d470.zip | |
only check for external mount points if the external storage app is enabled
| -rw-r--r-- | apps/files_encryption/lib/util.php | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php index 00b3192db8f..50e823585d7 100644 --- a/apps/files_encryption/lib/util.php +++ b/apps/files_encryption/lib/util.php @@ -1027,11 +1027,12 @@ class Util { } // check if it is a group mount - $mount = \OC_Mount_Config::getSystemMountPoints(); - foreach ($mount as $mountPoint => $data) { - if ($mountPoint == substr($ownerPath, 1, strlen($mountPoint))) { - $userIds = array_merge($userIds, - $this->getUserWithAccessToMountPoint($data['applicable']['users'], $data['applicable']['groups'])); + if (\OCP\App::isEnabled("files_external")) { + $mount = \OC_Mount_Config::getSystemMountPoints(); + foreach ($mount as $mountPoint => $data) { + if ($mountPoint == substr($ownerPath, 1, strlen($mountPoint))) { + $userIds = array_merge($userIds, $this->getUserWithAccessToMountPoint($data['applicable']['users'], $data['applicable']['groups'])); + } } } @@ -1567,10 +1568,12 @@ class Util { * @return boolean */ public function isSystemWideMountPoint($path) { - $mount = \OC_Mount_Config::getSystemMountPoints(); - foreach ($mount as $mountPoint => $data) { - if ($mountPoint == substr($path, 1, strlen($mountPoint))) { - return true; + if (\OCP\App::isEnabled("files_external")) { + $mount = \OC_Mount_Config::getSystemMountPoints(); + foreach ($mount as $mountPoint => $data) { + if ($mountPoint == substr($path, 1, strlen($mountPoint))) { + return true; + } } } return false; |