diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-06-06 10:02:23 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-06-06 10:02:23 +0200 |
| commit | ff651a3e0d764e72ec3146c0163c80b3a872a05a (patch) | |
| tree | 164806c6d50d691735a4e13771553db5f1fdb757 | |
| parent | 79b65269c9e1dd1cd01dc2fd28a979105650fc91 (diff) | |
| parent | ad4ec414c9e1cf4ff8189040a132ec81bf1fd377 (diff) | |
| download | nextcloud-server-ff651a3e0d764e72ec3146c0163c80b3a872a05a.tar.gz nextcloud-server-ff651a3e0d764e72ec3146c0163c80b3a872a05a.zip | |
Merge pull request #8909 from owncloud/fix-temporary-storage-rmdirr-master
use system function to recursive remove the directory used by temporary ...
| -rw-r--r-- | lib/private/files/storage/temporary.php | 4 | ||||
| -rw-r--r-- | tests/lib/files/view.php | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lib/private/files/storage/temporary.php b/lib/private/files/storage/temporary.php index d84dbda2e39..7547640f175 100644 --- a/lib/private/files/storage/temporary.php +++ b/lib/private/files/storage/temporary.php @@ -24,4 +24,8 @@ class Temporary extends Local{ parent::__destruct(); $this->cleanUp(); } + + public function getDataDir() { + return $this->datadir; + } } diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php index b2e0b59d8e6..8eca55d1fdf 100644 --- a/tests/lib/files/view.php +++ b/tests/lib/files/view.php @@ -669,7 +669,6 @@ class View extends \PHPUnit_Framework_TestCase { $rootView = new \OC\Files\View(''); - if ($param0 === '@0') { $param0 = $longPath; } @@ -681,6 +680,9 @@ class View extends \PHPUnit_Framework_TestCase { call_user_func(array($rootView, $operation), $longPath, $param0); + if (!\OC_Util::runningOnWindows()) { + system('rm -rf ' . escapeshellarg($storage->getDataDir())); + } } public function tooLongPathDataProvider() { |