diff options
| author | Florin Peter <github@florin-peter.de> | 2013-05-15 03:22:06 +0200 |
|---|---|---|
| committer | Florin Peter <github@florin-peter.de> | 2013-05-15 03:22:06 +0200 |
| commit | 226aec8d5602e112c413f8c0548b18c737a65a02 (patch) | |
| tree | aa745db7ea720bfd25ab8d890167885d1c505db4 /lib/public | |
| parent | d017bbb065245212e8aa4091f4bee0a4e8ea9055 (diff) | |
| parent | 6a788d1a545d5e0dcd6df6ec3c144fa593cf40c8 (diff) | |
| download | nextcloud-server-226aec8d5602e112c413f8c0548b18c737a65a02.tar.gz nextcloud-server-226aec8d5602e112c413f8c0548b18c737a65a02.zip | |
Merge branch 'master' into files_encryption
Diffstat (limited to 'lib/public')
| -rw-r--r-- | lib/public/share.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/public/share.php b/lib/public/share.php index e0aedf35694..29f9a1f0953 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -991,7 +991,10 @@ class Share { $row['path'] = '/Shared/'.basename($row['path']); } else { if (!isset($mounts[$row['storage']])) { - $mounts[$row['storage']] = \OC\Files\Mount::findByNumericId($row['storage']); + $mountPoints = \OC\Files\Filesystem::getMountByNumericId($row['storage']); + if (is_array($mountPoints)) { + $mounts[$row['storage']] = $mountPoints[key($mountPoints)]; + } } if ($mounts[$row['storage']]) { $path = $mounts[$row['storage']]->getMountPoint().$row['path']; |