diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-07 17:37:49 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-07 17:38:29 +0200 |
| commit | dbb93074b30e5edb95db75b0db79b14dc7ad3428 (patch) | |
| tree | b66c4415332e2f5ff919004d4d810ea7909b2033 | |
| parent | 31bf2d4b33ea28cb8db28201312ad48108136926 (diff) | |
| download | nextcloud-server-dbb93074b30e5edb95db75b0db79b14dc7ad3428.tar.gz nextcloud-server-dbb93074b30e5edb95db75b0db79b14dc7ad3428.zip | |
Fix endless loop on windows servers
Directory seperator is \ on windows
However we can just check for path != dirname(path) because that is
the same for '' (empty string), '.' and DIRECTORY_SEPARATOR on all OS
| -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 249211c306d..43f5f144d10 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); |