aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJakob Sack <kde@jakobsack.de>2011-07-22 23:16:43 +0200
committerJakob Sack <kde@jakobsack.de>2011-07-22 23:16:43 +0200
commitccc94819e2534431ee618f16f1dc522bf6e79c33 (patch)
tree6490d8337b564207b36b8e385a2ef3e5f006977d /lib
parent5416c0e6f828ef09d54f36d6ce39ec962ff4d156 (diff)
parent18a36be28cd94dd8d04c60f02b42bc79a5173b2f (diff)
downloadnextcloud-server-ccc94819e2534431ee618f16f1dc522bf6e79c33.tar.gz
nextcloud-server-ccc94819e2534431ee618f16f1dc522bf6e79c33.zip
Merge branch 'sabredav' of git://anongit.kde.org/owncloud into sabredav
Diffstat (limited to 'lib')
-rw-r--r--lib/Connector/Sabre/locks.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Connector/Sabre/locks.php b/lib/Connector/Sabre/locks.php
index 6c370b188fb..8414891b778 100644
--- a/lib/Connector/Sabre/locks.php
+++ b/lib/Connector/Sabre/locks.php
@@ -143,7 +143,7 @@ class OC_Connector_Sabre_Locks extends Sabre_DAV_Locks_Backend_Abstract {
*/
public function unlock($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
- $query = OC_DB::prepare( 'DELETE FROM *PREFIX*locks WHERE userid = ? AND path=? AND token=?' );
+ $query = OC_DB::prepare( 'DELETE FROM *PREFIX*locks WHERE userid = ? AND uri=? AND token=?' );
$result = $query->execute( array(OC_USER::getUser(),$uri,$lockInfo->token));
return $result->numRows() === 1;