Merge branch 'sharing_cleanup' of github.com:owncloud/core into sharing_cleanup

This commit is contained in:
Bjoern Schiessle 2014-05-07 17:57:32 +02:00
commit f85e968883
2 changed files with 2 additions and 2 deletions

View File

@ -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'];

View File

@ -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);