summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorBernhard Posselt <nukeawhale@gmail.com>2013-02-11 04:40:54 -0800
committerBernhard Posselt <nukeawhale@gmail.com>2013-02-11 04:40:54 -0800
commite70aef603f69304ece8105d0532cc55b15c3b7f1 (patch)
treeae75d0046e14e077b11e33ddd2289d43f6902c26 /lib
parentefc70e27bcebabce460692b925e5a695f12218bd (diff)
parente0da721a7dd51cf939f0aed533d5d0fa0fa8f74e (diff)
downloadnextcloud-server-e70aef603f69304ece8105d0532cc55b15c3b7f1.tar.gz
nextcloud-server-e70aef603f69304ece8105d0532cc55b15c3b7f1.zip
Merge pull request #1573 from owncloud/fixing-ctor-local-storage-master
adding dtor to Local and revert call to it within Temporary
Diffstat (limited to 'lib')
-rw-r--r--lib/files/storage/local.php2
-rw-r--r--lib/files/storage/temporary.php1
2 files changed, 3 insertions, 0 deletions
diff --git a/lib/files/storage/local.php b/lib/files/storage/local.php
index d387a898320..9fe01135866 100644
--- a/lib/files/storage/local.php
+++ b/lib/files/storage/local.php
@@ -23,6 +23,8 @@ class Local extends \OC\Files\Storage\Common{
$this->datadir.='/';
}
}
+ public function __destruct() {
+ }
public function getId(){
return 'local::'.$this->datadir;
}
diff --git a/lib/files/storage/temporary.php b/lib/files/storage/temporary.php
index 542d2cd9f48..d84dbda2e39 100644
--- a/lib/files/storage/temporary.php
+++ b/lib/files/storage/temporary.php
@@ -21,6 +21,7 @@ class Temporary extends Local{
}
public function __destruct() {
+ parent::__destruct();
$this->cleanUp();
}
}