aboutsummaryrefslogtreecommitdiff
path: root/controller/apicontroller.php
diff options
context:
space:
mode:
authorChristian Weiske <cweiske@cweiske.de>2016-03-18 18:05:50 +0100
committerChristian Weiske <cweiske@cweiske.de>2016-03-18 18:05:50 +0100
commit9501f181f621e9023a9cb27cbbc85afb2743eeca (patch)
tree4dd5a46f22b1161c8f891726619c8bc1dcd295bf /controller/apicontroller.php
parent26fb49247c6046cb7b3ecec28c5889227515204d (diff)
downloadgrauphel-9501f181f621e9023a9cb27cbbc85afb2743eeca.tar.gz
grauphel-9501f181f621e9023a9cb27cbbc85afb2743eeca.zip
#37: Use public database interface; fixes graupel on ownCloud 9
Diffstat (limited to 'controller/apicontroller.php')
-rw-r--r--controller/apicontroller.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/controller/apicontroller.php b/controller/apicontroller.php
index 90c036f..23a47e7 100644
--- a/controller/apicontroller.php
+++ b/controller/apicontroller.php
@@ -287,7 +287,8 @@ class ApiController extends Controller
}
//update
- \OC_DB::beginTransaction();
+ $db = \OC::$server->getDatabaseConnection();
+ $db->beginTransaction();
try {
++$syncdata->latestSyncRevision;
foreach ($arPut['note-changes'] as $noteUpdate) {
@@ -306,9 +307,9 @@ class ApiController extends Controller
}
$this->notes->saveSyncData($syncdata);
- \OC_DB::commit();
+ $db->commit();
} catch (\DatabaseException $e) {
- \OC_DB::getConnection()->rollBack();
+ $db->rollBack();
throw $e;
}
}