Merge pull request #3799 from owncloud/fix_pdo_statement_wrapper_numrows_on_modification

Fix pdo statement wrapper numrows on modification

diff --cc lib/connector/sabre/locks.php
index 7aca2e437129714038ef0a3ffff6d1ccd0064c70,e057b05994764c9655b9d9cd63336d1992c4d7b2..69496c15adadd75db8eda4fa35e719f83c5fca3d
--- 1/lib/connector/sabre/locks.php
--- 2/lib/connector/sabre/locks.php
+++ b/lib/connector/sabre/locks.php
@@@ -176,13 -176,9 +176,13 @@@ class OC_Connector_Sabre_Locks extends 
        public function unlock($uri, Sabre_DAV_Locks_LockInfo $lockInfo) {
  
                $sql = 'DELETE FROM `*PREFIX*locks` WHERE `userid` = ? AND `uri` = ? AND `token` = ?';
 +              if (OC_Config::getValue( "dbtype") === 'oci') {
 +                      //FIXME oracle hack: need to explicitly cast CLOB to CHAR for comparison
 +                      $sql = 'DELETE FROM `*PREFIX*locks` WHERE `userid` = ? AND to_char(`uri`) = ? AND `token` = ?';
 +              }
                $result = OC_DB::executeAudited( $sql, array(OC_User::getUser(), $uri, $lockInfo->token));
  
-               return $result->numRows() === 1;
+               return $result === 1;
  
        }
  

diff --cc lib/db.php
Simple merge