[Pkg-owncloud-commits] [owncloud] 42/457: Merge pull request #16399 from owncloud/enc_rmdir_fix

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit f9b6ee86cda4fe5c2d58218c0c68cf68b2796a5a
Merge: c28cd03 efa674f
Author: Clark Tomlinson <fallen013 at gmail.com>
Date:   Mon May 18 11:09:36 2015 -0400

    Merge pull request #16399 from owncloud/enc_rmdir_fix
    
    [encryption] only try to delete file keys if it is a valid path

 lib/private/files/storage/wrapper/encryption.php |  8 ++-
 tests/lib/files/storage/wrapper/encryption.php   | 81 ++++++++++++++++++++++--
 2 files changed, 80 insertions(+), 9 deletions(-)

diff --cc tests/lib/files/storage/wrapper/encryption.php
index 361592f,4109aca..39af648
--- a/tests/lib/files/storage/wrapper/encryption.php
+++ b/tests/lib/files/storage/wrapper/encryption.php
@@@ -112,12 -128,12 +128,12 @@@ class Encryption extends \Test\Files\St
  						'storage' => $this->sourceStorage,
  						'root' => 'foo',
  						'mountPoint' => '/',
- 						'mount' => $mount
+ 						'mount' => $this->mount
  					],
- 					$this->encryptionManager, $this->util, $logger, $file, null, $this->keyStore, $this->update
+ 					$this->encryptionManager, $this->util, $this->logger, $this->file, null, $this->keyStore, $this->update
  				]
  			)
 -			->setMethods(['getMetaData', 'getCache'])
 +			->setMethods(['getMetaData', 'getCache', 'getEncryptionModule'])
  			->getMock();
  
  		$this->instance->expects($this->any())

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git