summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2017-08-15 18:17:58 +0200
committerGitHub <noreply@github.com>2017-08-15 18:17:58 +0200
commitf698aa11e7060ccf6069cf248dd0b83dd9db45d8 (patch)
tree57591f4c6ec687157a4b2e4a8a40f9ee7fa94e25
parent422c3e302a32f9364c4b4fef519f9616454b2dfa (diff)
parentbbd8797f1e28e7585e016fdbeb5b9e390f184806 (diff)
downloadnextcloud-server-f698aa11e7060ccf6069cf248dd0b83dd9db45d8.tar.gz
nextcloud-server-f698aa11e7060ccf6069cf248dd0b83dd9db45d8.zip
Merge pull request #6101 from cbartz/patch-1
Missing array assignment in Swift.php
-rw-r--r--apps/files_external/lib/Lib/Storage/Swift.php7
1 files changed, 1 insertions, 6 deletions
diff --git a/apps/files_external/lib/Lib/Storage/Swift.php b/apps/files_external/lib/Lib/Storage/Swift.php
index 4dc6ff37b19..a775195e85e 100644
--- a/apps/files_external/lib/Lib/Storage/Swift.php
+++ b/apps/files_external/lib/Lib/Storage/Swift.php
@@ -75,11 +75,6 @@ class Swift extends \OC\Files\Storage\Common {
private $id;
/**
- * @var array
- */
- private static $tmpFiles = array();
-
- /**
* Key value cache mapping path to data object. Maps path to
* \OpenCloud\OpenStack\ObjectStorage\Resource\DataObject for existing
* paths and path to false for not existing paths.
@@ -617,7 +612,7 @@ class Swift extends \OC\Files\Storage\Common {
$fileData = fopen($tmpFile, 'r');
$this->getContainer()->uploadObject($path, $fileData);
// invalidate target object to force repopulation on fetch
- $this->objectCache->remove(self::$tmpFiles[$tmpFile]);
+ $this->objectCache->remove($path);
unlink($tmpFile);
}