tonyair
/
cms-niceties
mirror of https://github.com/a2nt/cms-niceties.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Compare commits

base: tonyair:0588e3a40994b2e11490bdc980408e10a451a48c
Branches Tags
tonyair:main
tonyair:v5
tonyair:v4
...
compare: tonyair:141043d219d61e767cf20e243ae35efa135412c1
Branches Tags
tonyair:main
tonyair:v5
tonyair:v4

2 Commits
0588e3a409 ... 141043d219

Author SHA1 Message Date
Tony Air 141043d219 FIX: PHP8.1 2024-03-24 22:46:35 +02:00
Tony Air a6d9d432a6 FIX: AJAX 2024-03-24 22:33:48 +02:00
1 changed files with 5 additions and 3 deletions
Show Stats Expand all files Collapse all files

8
src/Ajax/Ex/AjaxControllerEx.php
View File

@ -207,9 +207,11 @@ class AjaxControllerEx extends Extension
$url = $req->getURL();
$url = $url === 'home' ? '/' : $url;
$ajax_res = $ctrl->config()->get('ajax_resources');
$graphql_res = $ctrl->config()->get('graphql_resources');
$resources = array_merge(
$ctrl->config()->get('graphql_resources'),
$ctrl->config()->get('ajax_resources')
$ajax_res ? $ajax_res : [],
$graphql_res ? $graphql_res : []
);
$body = $response->getBody();
@ -259,7 +261,7 @@ class AjaxControllerEx extends Extension
}
// render page
if (!self::isJson($body)) {
if ($body && !self::isJson($body)) {
$body = json_encode([
'ID' => $record->ID,
'Title' => $record->Title,