From a3d009e3b58099dfd86c53329290665ed09f7d72 Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Wed, 14 Aug 2013 20:51:36 +0200 Subject: [PATCH] also create root dir if it doesn't exist yet --- apps/files_versions/lib/versions.php | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php index b0fde6b559f..ddf73f415c5 100644 --- a/apps/files_versions/lib/versions.php +++ b/apps/files_versions/lib/versions.php @@ -112,10 +112,11 @@ class Storage { // create all parent folders $dirname= \OC_Filesystem::normalizePath(pathinfo($filename, PATHINFO_DIRNAME)); $dirParts = explode('/', $dirname); + $dir = "/files_versions"; foreach ($dirParts as $part) { $dir = $dir.'/'.$part; - if(!$versions_view->file_exists($dir)) { - $versions_view->mkdir($dir); + if(!$users_view->file_exists($dir)) { + $users_view->mkdir($dir); } } @@ -186,13 +187,19 @@ class Storage { self::expire($newpath); - $abs_newpath = $versions_view->getLocalFile($newpath); - if ( $files_view->is_dir($oldpath) && $versions_view->is_dir($oldpath) ) { $versions_view->rename($oldpath, $newpath); } else if ( ($versions = Storage::getVersions($uid, $oldpath)) ) { - $info=pathinfo($abs_newpath); - if(!file_exists($info['dirname'])) mkdir($info['dirname'], 0750, true); + // create missing dirs if necessary + $dirname = \OC_Filesystem::normalizePath(pathinfo($newpath, PATHINFO_DIRNAME)); + $dirParts = explode('/', $dirname); + $dir = "/files_versions"; + foreach ($dirParts as $part) { + $dir = $dir.'/'.$part; + if(!$users_view->file_exists($dir)) { + $users_view->mkdir($dir); + } + } foreach ($versions as $v) { $versions_view->rename($oldpath.'.v'.$v['version'], $newpath.'.v'.$v['version']); } -- 2.39.5