diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-09-24 21:06:27 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-09-24 21:06:27 +0200 |
| commit | e7bc2a10e3ffd16cda8d15ff06dcbc870e34a627 (patch) | |
| tree | 975e247e53378834d6b59b06ae3a76b5bb60a217 /lib | |
| parent | 320a4eb149150144e755914c39281653cf2a2130 (diff) | |
| parent | b3ff773bbf363e4d7d44d7c6ce7ae2eec8250cfb (diff) | |
| download | nextcloud-server-e7bc2a10e3ffd16cda8d15ff06dcbc870e34a627.tar.gz nextcloud-server-e7bc2a10e3ffd16cda8d15ff06dcbc870e34a627.zip | |
Merge pull request #15098 from owncloud/fix_preview_versions_revert_issue
fix issue with version rollback and thumbnails
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/base.php | 3 | ||||
| -rw-r--r-- | lib/private/preview.php | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lib/base.php b/lib/base.php index 3624a3fbaf9..f99acaaa80a 100644 --- a/lib/base.php +++ b/lib/base.php @@ -803,8 +803,9 @@ class OC { OC_Hook::connect('\OCP\Versions', 'preDelete', 'OC\Preview', 'prepare_delete'); OC_Hook::connect('\OCP\Trashbin', 'preDelete', 'OC\Preview', 'prepare_delete'); OC_Hook::connect('OC_Filesystem', 'post_delete', 'OC\Preview', 'post_delete_files'); - OC_Hook::connect('\OCP\Versions', 'delete', 'OC\Preview', 'post_delete'); + OC_Hook::connect('\OCP\Versions', 'delete', 'OC\Preview', 'post_delete_versions'); OC_Hook::connect('\OCP\Trashbin', 'delete', 'OC\Preview', 'post_delete'); + OC_Hook::connect('\OCP\Versions', 'rollback', 'OC\Preview', 'post_delete_versions'); } /** diff --git a/lib/private/preview.php b/lib/private/preview.php index 978da1161c2..de964b72df2 100644 --- a/lib/private/preview.php +++ b/lib/private/preview.php @@ -1296,6 +1296,13 @@ class Preview { /** * @param array $args + */ + public static function post_delete_versions($args) { + self::post_delete($args, 'files/'); + } + + /** + * @param array $args * @param string $prefix */ public static function post_delete($args, $prefix = '') { |