]> source.dussan.org Git - nextcloud-server.git/commitdiff
fix getVersions() for sub directories
authorBjoern Schiessle <schiessle@owncloud.com>
Thu, 10 Oct 2013 14:58:11 +0000 (16:58 +0200)
committerBjoern Schiessle <schiessle@owncloud.com>
Thu, 10 Oct 2013 14:58:11 +0000 (16:58 +0200)
apps/files_versions/lib/versions.php

index 5b291dfa10b41bd0abfecfea5724bb030c551f83..8151324696fee0573e68bcab0fdcb20c5465d423 100644 (file)
@@ -249,8 +249,9 @@ class Storage {
                foreach ($files as $file) {
                        if ($file['type'] === 'file') {
                                $pos = strrpos($file['path'], '.v');
-                               $length = $pos - strlen('files_versions/');
-                               if (substr($file['path'], strlen('files_versions/'), $length) === $versionedFile) {
+                               $length = $pos - strlen('files_versions/'.dirname($filename));
+                               $currentFile = substr($file['name'], 0, strrpos($file['name'], '.v'));
+                               if ($currentFile === $versionedFile) {
                                        $version = substr($file['path'], $pos + 2);
                                        $key = $version . '#' . $filename;
                                        $versions[$key]['cur'] = 0;