friendica/friendica-addons
7
2
Fork 14
Code Issues 3 Pull requests 3 Releases 16 Wiki Activity

Merge pull request #966 from MrPetovan/bug/8396-advancedcontentfilter-exceptions

Browse source 
[advancedcontentfilter] Update HTTPException handling
This commit is contained in:
Michael Vogel 2020-03-10 23:56:15 +01:00 committed by GitHub
parent 8b17ea90c4 f2772b87c0
commit bcf99d066d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
advancedcontentfilter/advancedcontentfilter.php
View file

@ -330,7 +330,7 @@ function advancedcontentfilter_post_rules(ServerRequestInterface $request)
try { try {
$fields = advancedcontentfilter_build_fields($data); $fields = advancedcontentfilter_build_fields($data);
} catch (Exception $e) { } catch (Exception $e) {
throw new HTTPException\BadRequestException($e->getMessage(), 0, $e); throw new HTTPException\BadRequestException($e->getMessage(), $e);
} }
if (empty($fields['name']) || empty($fields['expression'])) { if (empty($fields['name']) || empty($fields['expression'])) {
@ -368,7 +368,7 @@ function advancedcontentfilter_put_rules_id(ServerRequestInterface $request, Res
try { try {
$fields = advancedcontentfilter_build_fields($data); $fields = advancedcontentfilter_build_fields($data);
} catch (Exception $e) { } catch (Exception $e) {
throw new HTTPException\BadRequestException($e->getMessage(), 0, $e); throw new HTTPException\BadRequestException($e->getMessage(), $e);
} }
if (!DBA::update('advancedcontentfilter_rules', $fields, ['id' => $args['id']])) { if (!DBA::update('advancedcontentfilter_rules', $fields, ['id' => $args['id']])) {

2
advancedcontentfilter/src/middlewares.php
View file

@ -30,7 +30,7 @@ $container['errorHandler'] = function () {
$responseCode = 500; $responseCode = 500;
if (is_a($exception, 'Friendica\Network\HTTPException')) { if (is_a($exception, 'Friendica\Network\HTTPException')) {
$responseCode = $exception->httpcode; $responseCode = $exception->getCode();
} }
$errors['message'] = $exception->getMessage(); $errors['message'] = $exception->getMessage();