diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-10-25 18:26:08 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-10-25 18:26:08 +0200 |
| commit | 7bc49d2a57ab337f7a74d55e748e69284e3be430 (patch) | |
| tree | fc54618043ae5e0e4f36e0a23d171dfa18a0947c /lib/connector/sabre | |
| parent | 5a3d6805a2613c4f55daa971e112cc77f17b060f (diff) | |
| parent | ec613b589bed2069346696902f59eadc2a3a91d5 (diff) | |
| download | nextcloud-server-7bc49d2a57ab337f7a74d55e748e69284e3be430.tar.gz nextcloud-server-7bc49d2a57ab337f7a74d55e748e69284e3be430.zip | |
merge master into filesystem
Diffstat (limited to 'lib/connector/sabre')
| -rw-r--r-- | lib/connector/sabre/locks.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/connector/sabre/locks.php b/lib/connector/sabre/locks.php index dbcc57558e0..8ebe324602c 100644 --- a/lib/connector/sabre/locks.php +++ b/lib/connector/sabre/locks.php @@ -109,7 +109,7 @@ class OC_Connector_Sabre_Locks extends Sabre_DAV_Locks_Backend_Abstract { $lockInfo->created = time(); $lockInfo->uri = $uri; - $locks = $this->getLocks($uri,false); + $locks = $this->getLocks($uri, false); $exists = false; foreach($locks as $lock) { if ($lock->token == $lockInfo->token) $exists = true; |