diff --git a/Actions/ApplyModelAttrsToThemeAction.php b/Actions/ApplyModelAttrsToThemeAction.php index a2238798..33eca818 100755 --- a/Actions/ApplyModelAttrsToThemeAction.php +++ b/Actions/ApplyModelAttrsToThemeAction.php @@ -40,6 +40,7 @@ public function execute(Model $model, string $name, array $extra = []): NotifyTh $data = $model->toArray(); $data = array_merge($data, $extra); + $html = $theme->body_html; foreach ($data as $k => $v) { if (\is_string($v)) { @@ -48,7 +49,7 @@ public function execute(Model $model, string $name, array $extra = []): NotifyTh } $html = preg_replace('/##\w+##/', 'N.D.', $html); - + $theme->mail_body = $html; // dddx($theme->mail_body); diff --git a/Models/Panels/NotifyThemePanel.php b/Models/Panels/NotifyThemePanel.php index 6b54fd4c..d380e0d2 100755 --- a/Models/Panels/NotifyThemePanel.php +++ b/Models/Panels/NotifyThemePanel.php @@ -337,4 +337,4 @@ public function actions(): array { >>>>>>> 6d24e5b (.) return []; } -} +} \ No newline at end of file