git.cweiske.de
/
grauphel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Get rid of deprecated API usage:
[grauphel.git]
/
controller
/
apicontroller.php
diff --git
a/controller/apicontroller.php
b/controller/apicontroller.php
index 39de60d209de3080fa0d3341b601df29b8edfb07..23a47e796abc0fff201ccde79bb046561137edd0 100644
(file)
--- a/
controller/apicontroller.php
+++ b/
controller/apicontroller.php
@@
-119,7
+119,7
@@
class ApiController extends Controller
'grauphel.api.user', array('username' => $username)
)
),
'grauphel.api.user', array('username' => $username)
)
),
- 'href' => null,
//FIXME
+ 'href' => null,
);
}
);
}
@@
-167,7
+167,9
@@
class ApiController extends Controller
'grauphel.api.notes', array('username' => $username)
)
),
'grauphel.api.notes', array('username' => $username)
)
),
- 'href' => null,
+ 'href' => $this->deps->urlGen->getAbsoluteURL(
+ $this->deps->urlGen->linkToRoute('grauphel.gui.index')
+ ),
),
'latest-sync-revision' => $syncdata->latestSyncRevision,
'current-sync-guid' => $syncdata->currentSyncGuid,
),
'latest-sync-revision' => $syncdata->latestSyncRevision,
'current-sync-guid' => $syncdata->currentSyncGuid,
@@
-285,7
+287,8
@@
class ApiController extends Controller
}
//update
}
//update
- \OC_DB::beginTransaction();
+ $db = \OC::$server->getDatabaseConnection();
+ $db->beginTransaction();
try {
++$syncdata->latestSyncRevision;
foreach ($arPut['note-changes'] as $noteUpdate) {
try {
++$syncdata->latestSyncRevision;
foreach ($arPut['note-changes'] as $noteUpdate) {
@@
-304,9
+307,9
@@
class ApiController extends Controller
}
$this->notes->saveSyncData($syncdata);
}
$this->notes->saveSyncData($syncdata);
-
\OC_DB::
commit();
+
$db->
commit();
} catch (\DatabaseException $e) {
} catch (\DatabaseException $e) {
-
\OC_DB::getConnection()
->rollBack();
+
$db
->rollBack();
throw $e;
}
}
throw $e;
}
}