diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2014-09-23 12:36:34 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2014-09-23 12:36:34 +0200 |
| commit | 75593f87d547b8e24105ec18434bf5bdd0aa3447 (patch) | |
| tree | 66cc62877c69de00310e5b201029c6e2f6ce705f /apps/files_trashbin/lib | |
| parent | 42fe0b9e0865cfa81edae922e77144e789e52447 (diff) | |
| parent | 1e631754d78e98d74ba0d3fb477d5eb815e9dfb3 (diff) | |
| download | nextcloud-server-75593f87d547b8e24105ec18434bf5bdd0aa3447.tar.gz nextcloud-server-75593f87d547b8e24105ec18434bf5bdd0aa3447.zip | |
Merge pull request #11137 from owncloud/enc-pregfix
Fix share key pattern matching
Diffstat (limited to 'apps/files_trashbin/lib')
| -rw-r--r-- | apps/files_trashbin/lib/trashbin.php | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php index ca7e58d93bd..3fe0ef0b7de 100644 --- a/apps/files_trashbin/lib/trashbin.php +++ b/apps/files_trashbin/lib/trashbin.php @@ -318,12 +318,8 @@ class Trashbin { } $rootView->rename($sharekeys, $user . '/files_trashbin/share-keys/' . $filename . '.d' . $timestamp); } else { - // get local path to share-keys - $localShareKeysPath = $rootView->getLocalFile($sharekeys); - $escapedLocalShareKeysPath = preg_replace('/(\*|\?|\[)/', '[$1]', $localShareKeysPath); - // handle share-keys - $matches = glob($escapedLocalShareKeysPath . '*.shareKey'); + $matches = \OCA\Encryption\Helper::findShareKeys($ownerPath, $sharekeys, $rootView); foreach ($matches as $src) { // get source file parts $pathinfo = pathinfo($src); |