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_encryption/hooks | |
| 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_encryption/hooks')
| -rw-r--r-- | apps/files_encryption/hooks/hooks.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php index 8eda8ef0881..e004d4a1d63 100644 --- a/apps/files_encryption/hooks/hooks.php +++ b/apps/files_encryption/hooks/hooks.php @@ -523,7 +523,13 @@ class Hooks { $newKeyfilePath .= '.key';
// handle share-keys
- $matches = Helper::findShareKeys($oldShareKeyPath, $view);
+ $matches = Helper::findShareKeys($pathOld, $oldShareKeyPath, $view);
+ if (count($matches) === 0) {
+ \OC_Log::write(
+ 'Encryption library', 'No share keys found for "' . $pathOld . '"',
+ \OC_Log::WARN
+ );
+ }
foreach ($matches as $src) {
$dst = \OC\Files\Filesystem::normalizePath(str_replace($pathOld, $pathNew, $src));
$view->$operation($src, $dst);
|