diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-10-17 15:08:10 +0400 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-10-17 15:08:10 +0400 |
| commit | b4ca61550f493ec097f5c16ad797cbfd48b4b665 (patch) | |
| tree | 5d6777d189dbaab8faf3794bc2f422987dbf2561 /files_archive | |
| parent | 6d35df9344b88f8b0a0ec4c486df504f01b5238d (diff) | |
| parent | 8151ad7d6b22e931cf5d7ab2a321f44a5f21d912 (diff) | |
merge master into filesystem
Diffstat (limited to 'files_archive')
| -rw-r--r-- | files_archive/tests/storage.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/files_archive/tests/storage.php b/files_archive/tests/storage.php index 7a6dc6bc1..a82aa552d 100644 --- a/files_archive/tests/storage.php +++ b/files_archive/tests/storage.php @@ -13,7 +13,7 @@ class Archive_Zip extends Storage { * @var string tmpDir */ private $tmpFile; - + public function setUp() { $this->tmpFile=\OCP\Files::tmpFile('.zip'); $this->instance=new \OC\Files\Storage\Archive(array('archive'=>$this->tmpFile)); |