Merge pull request #657 from MrPetovan/task/5410-rename-database-methods

[advancedcontentfilter] Rename DBA::inArray to DBA::toArray
This commit is contained in:
Michael Vogel 2018-07-23 15:19:05 +02:00 committed by GitHub
commit 8cdacf34b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -119,7 +119,7 @@ function advancedcontentfilter_prepare_body_content_filter(App $a, &$hook_data)
$rules = Cache::get('rules_' . local_user()); $rules = Cache::get('rules_' . local_user());
if (!isset($rules)) { if (!isset($rules)) {
$rules = DBA::inArray(DBA::select( $rules = DBA::toArray(DBA::select(
'advancedcontentfilter_rules', 'advancedcontentfilter_rules',
['name', 'expression', 'serialized'], ['name', 'expression', 'serialized'],
['uid' => local_user(), 'active' => true] ['uid' => local_user(), 'active' => true]
@ -300,7 +300,7 @@ function advancedcontentfilter_get_rules()
throw new HTTPException\UnauthorizedException(L10n::t('You must be logged in to use this method')); throw new HTTPException\UnauthorizedException(L10n::t('You must be logged in to use this method'));
} }
$rules = DBA::inArray(DBA::select('advancedcontentfilter_rules', [], ['uid' => local_user()])); $rules = DBA::toArray(DBA::select('advancedcontentfilter_rules', [], ['uid' => local_user()]));
return json_encode($rules); return json_encode($rules);
} }