Fix to make the Unlock mechanism of WebDAV work. Previously when using unlock in cadaver etc was used the lock entry corresponding to the file was not deleted in the sqlite database table oc_locks. The error was because the delete query in the Unlock function was not getting executed :)

1 files changed, 6 insertions, 1 deletions

diff --git a/lib/HTTP/WebDAV/Server/Filesystem.php b/lib/HTTP/WebDAV/Server/Filesystem.php
index 164892c9d86..5f261643624 100644
--- a/lib/HTTP/WebDAV/Server/Filesystem.php
+++ b/lib/HTTP/WebDAV/Server/Filesystem.php
@@ -687,9 +687,14 @@ VALUES (?,?,?,?,?,'timeout',?,?)");
     function UNLOCK(&$options)
     {
             $query = OC_DB::prepare("DELETE FROM *PREFIX*locks
+                      WHERE path = '$options[path]'
+                        AND token = '$options[token]'");
+	    /*
+	    $query = OC_DB::prepare("DELETE FROM *PREFIX*locks
                       WHERE path = ?
                         AND token = ?");
-            $query->execute(array($options[path]),$options[token]);
+	    */
+            $query->execute();#array($options[path]),$options[token]);
 			return PEAR::isError($result) ? "409 Conflict" : "204 No Content";
     }