diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 78e4e0f..bfd2d43 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -451,7 +451,7 @@ final class ApiController extends Controller * * @since 1.0.0 */ - public static function loadFileContent(string $path, string $extension, string $output = 'html') : string + public static function loadFileContent(string $path, string $extension, string $output = 'html', array $data = []) : string { switch ($extension) { case 'pdf': @@ -497,6 +497,9 @@ final class ApiController extends Controller $contents = \file_get_contents($path); return $contents === false ? '' : $contents; + case 'htm': + case 'html': + return \phpOMS\Utils\Parser\Html\HtmlParser::parseHtml($path, $output, $data['path'] ?? ''); default: return ''; } diff --git a/Theme/Backend/Components/InlinePreview/BaseView.php b/Theme/Backend/Components/InlinePreview/BaseView.php index 2a631ce..23b4cf8 100755 --- a/Theme/Backend/Components/InlinePreview/BaseView.php +++ b/Theme/Backend/Components/InlinePreview/BaseView.php @@ -73,7 +73,7 @@ class BaseView extends View /** * {@inheritdoc} */ - public function __construct(?L11nManager $l11n = null, RequestAbstract $request, ResponseAbstract $response) + public function __construct(L11nManager $l11n, RequestAbstract $request, ResponseAbstract $response) { parent::__construct($l11n, $request, $response); $this->setTemplate('/Modules/Media/Theme/Backend/Components/InlinePreview/inline-preview'); diff --git a/Theme/Backend/Components/Media/ListView.php b/Theme/Backend/Components/Media/ListView.php index 3369174..5387039 100755 --- a/Theme/Backend/Components/Media/ListView.php +++ b/Theme/Backend/Components/Media/ListView.php @@ -41,7 +41,7 @@ class ListView extends View /** * {@inheritdoc} */ - public function __construct(?L11nManager $l11n = null, RequestAbstract $request, ResponseAbstract $response) + public function __construct(L11nManager $l11n, RequestAbstract $request, ResponseAbstract $response) { parent::__construct($l11n, $request, $response); $this->setTemplate('/Modules/Media/Theme/Backend/Components/Media/list'); diff --git a/Theme/Backend/Components/Upload/BaseView.php b/Theme/Backend/Components/Upload/BaseView.php index 7d22b29..bda2889 100755 --- a/Theme/Backend/Components/Upload/BaseView.php +++ b/Theme/Backend/Components/Upload/BaseView.php @@ -65,7 +65,7 @@ class BaseView extends View /** * {@inheritdoc} */ - public function __construct(?L11nManager $l11n = null, RequestAbstract $request, ResponseAbstract $response) + public function __construct(L11nManager $l11n, RequestAbstract $request, ResponseAbstract $response) { parent::__construct($l11n, $request, $response); $this->setTemplate('/Modules/Media/Theme/Backend/Components/Upload/upload-list');