[TASK] Work on compatibility for TYPO3 11
This commit is contained in:
parent
786c200609
commit
d66fdf29a1
@ -805,8 +805,13 @@ class ActionController extends BaseController
|
|||||||
if ($this->reload) {
|
if ($this->reload) {
|
||||||
$result['reload'] = true;
|
$result['reload'] = true;
|
||||||
}
|
}
|
||||||
|
if (version_compare(TYPO3_branch, '10.0', '>=')) {
|
||||||
|
$response->getBody()->write(json_encode($result));
|
||||||
|
return $response;
|
||||||
|
} else {
|
||||||
return json_encode($result);
|
return json_encode($result);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
$result = array_merge(
|
$result = array_merge(
|
||||||
$result,
|
$result,
|
||||||
['cid' => $this->contentObjectUid],
|
['cid' => $this->contentObjectUid],
|
||||||
@ -820,5 +825,12 @@ class ActionController extends BaseController
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
$this->view->assignMultiple($result);
|
$this->view->assignMultiple($result);
|
||||||
|
return $this
|
||||||
|
->responseFactory
|
||||||
|
->createResponse()
|
||||||
|
->withHeader('Content-Type', 'text/html; charset=utf-8')
|
||||||
|
->withBody($this->streamFactory->createStream(
|
||||||
|
(string)($html ?? $this->view->render()))
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user