diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2014-05-07 17:57:32 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2014-05-07 17:57:32 +0200 |
| commit | f85e968883bfdb56bc3e1a22221acaf21f0943b4 (patch) | |
| tree | f0303f4f4fcfe578b1199889c1163c3f783d9c65 /apps | |
| parent | d3f957c21e5ed0e6dc33b8d3be0d2aae2eeaaa24 (diff) | |
| parent | dbb93074b30e5edb95db75b0db79b14dc7ad3428 (diff) | |
| download | nextcloud-server-f85e968883bfdb56bc3e1a22221acaf21f0943b4.tar.gz nextcloud-server-f85e968883bfdb56bc3e1a22221acaf21f0943b4.zip | |
Merge branch 'sharing_cleanup' of github.com:owncloud/core into sharing_cleanup
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files_sharing/lib/helper.php | 2 | ||||
| -rw-r--r-- | apps/files_sharing/lib/updater.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/files_sharing/lib/helper.php b/apps/files_sharing/lib/helper.php index c7347539fcc..7a5b859826c 100644 --- a/apps/files_sharing/lib/helper.php +++ b/apps/files_sharing/lib/helper.php @@ -125,7 +125,7 @@ class Helper { $ids = array(); - while ($path !== '' && $path !== '.' && $path !== '/') { + while ($path !== dirname($path)) { $info = $ownerView->getFileInfo($path); if ($info instanceof \OC\Files\FileInfo) { $ids[] = $info['fileid']; diff --git a/apps/files_sharing/lib/updater.php b/apps/files_sharing/lib/updater.php index ff9c295c008..49044383df5 100644 --- a/apps/files_sharing/lib/updater.php +++ b/apps/files_sharing/lib/updater.php @@ -38,7 +38,7 @@ class Shared_Updater { \OC\Files\Filesystem::initMountPoints($user); $view = new \OC\Files\View('/' . $user); if ($view->file_exists($path)) { - while ($path !== '/') { + while ($path !== dirname($path)) { $etag = $view->getETag($path); $view->putFileInfo($path, array('etag' => $etag)); $path = dirname($path); |