tonyair/silverstripe-contentreview
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-contentreview synced 2024-10-22 17:05:47 +02:00
Code Issues Projects Releases Wiki Activity

ENH Update code to reflect changes in template layer

Browse Source
This commit is contained in:
Guy Sartorelli 2024-10-11 11:44:53 +13:00
parent cd1b9ed9f2
commit 94bd9e056d
No known key found for this signature in database
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Tasks/ContentReviewEmails.php
View File

@ -5,6 +5,7 @@ namespace SilverStripe\ContentReview\Tasks;
use Page; use Page;
use SilverStripe\ContentReview\Compatibility\ContentReviewCompatability; use SilverStripe\ContentReview\Compatibility\ContentReviewCompatability;
use SilverStripe\Control\Email\Email; use SilverStripe\Control\Email\Email;
use SilverStripe\Core\Injector\Injector;
use SilverStripe\Dev\BuildTask; use SilverStripe\Dev\BuildTask;
use SilverStripe\PolyExecution\PolyOutput; use SilverStripe\PolyExecution\PolyOutput;
use SilverStripe\Model\List\ArrayList; use SilverStripe\Model\List\ArrayList;
@ -14,7 +15,8 @@ use SilverStripe\Model\List\SS_List;
use SilverStripe\Security\Member; use SilverStripe\Security\Member;
use SilverStripe\SiteConfig\SiteConfig; use SilverStripe\SiteConfig\SiteConfig;
use SilverStripe\Model\ArrayData; use SilverStripe\Model\ArrayData;
use SilverStripe\View\SSViewer; use SilverStripe\View\TemplateEngine;
use SilverStripe\View\ViewLayerData;
use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputInterface;
@ -165,9 +167,8 @@ class ContentReviewEmails extends BuildTask
*/ */
protected function getEmailBody($config, $variables) protected function getEmailBody($config, $variables)
{ {
$template = SSViewer::fromString($config->ReviewBody); $engine = Injector::inst()->create(TemplateEngine::class);
$value = $template->process(ArrayData::create($variables)); $value = $engine->renderString($config->ReviewBody, ViewLayerData::create(ArrayData::create($variables)));
// Cast to HTML // Cast to HTML
return DBField::create_field('HTMLText', (string) $value); return DBField::create_field('HTMLText', (string) $value);
} }
@ -176,7 +177,7 @@ class ContentReviewEmails extends BuildTask
* Gets list of safe template variables and their values which can be used * Gets list of safe template variables and their values which can be used
* in both the static and editable templates. * in both the static and editable templates.
* *
* {@see ContentReviewAdminHelp.ss} * see ContentReviewAdminHelp template
* *
* @param Member $recipient * @param Member $recipient
* @param SiteConfig $config * @param SiteConfig $config