Skip to content

Commit 266d403

Browse files
authored
Merge pull request dokuwiki#4414 from dokuwiki/fixapierrorcode
do not return zero error code for API exceptions. fixes dokuwiki#4413
2 parents a118ce8 + 5c3fa12 commit 266d403

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

inc/Remote/JsonRpcServer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ protected function addErrorData(&$response, $e = null)
143143
if ($e !== null) {
144144
// error occured, add to response
145145
$response['error'] = [
146-
'code' => $e->getCode(),
146+
'code' => $e->getCode() ?: 1, // 0 is success, so we use 1 as default
147147
'message' => $e->getMessage()
148148
];
149149
} else {

lib/exe/xmlrpc.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
1515
try {
1616
$server->serve();
1717
} catch (\Exception $e) {
18-
$server->error($e->getCode(), $e->getMessage());
18+
$server->error($e->getCode() ?: 1, $e->getMessage());
1919
}

0 commit comments

Comments
 (0)