Mail: Make language variable placeholder interpolation more robust

See: https://mantis.ilias.de/view.php?id=37831
surlabs · Sep 6, 2023 · 522d570 · 522d570
1 parent d0f2f72
commit 522d570
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/Services/Mail/classes/class.ilMailFormGUI.php b/Services/Mail/classes/class.ilMailFormGUI.php
@@ -743,7 +743,11 @@ public function showForm()
 
         $placeholders = new ilManualPlaceholderInputGUI('m_message');
         $placeholders->setInstructionText($this->lng->txt('mail_nacc_use_placeholder'));
-        $placeholders->setAdviseText(sprintf($this->lng->txt('placeholders_advise'), '<br />'));
+        try {
+            $placeholders->setAdviseText(sprintf($this->lng->txt('placeholders_advise'), '<br />'));
+        } catch (Throwable $e) {
+            $placeholders->setAdviseText($this->lng->txt('placeholders_advise'));
+        }
         foreach ($context->getPlaceholders() as $key => $value) {
             $placeholders->addPlaceholder($value['placeholder'], $value['label']);
         }

diff --git a/Services/Mail/classes/class.ilMailTemplateGUI.php b/Services/Mail/classes/class.ilMailTemplateGUI.php
@@ -444,7 +444,11 @@ public function getAjaxPlaceholdersById() : void
 
         $placeholders = new ilManualPlaceholderInputGUI('m_message');
         $placeholders->setInstructionText($this->lng->txt('mail_nacc_use_placeholder'));
-        $placeholders->setAdviseText(sprintf($this->lng->txt('placeholders_advise'), '<br />'));
+        try {
+            $placeholders->setAdviseText(sprintf($this->lng->txt('placeholders_advise'), '<br />'));
+        } catch (Throwable $e) {
+            $placeholders->setAdviseText($this->lng->txt('placeholders_advise'));
+        }
 
         $context = ilMailTemplateContextService::getTemplateContextById($contextId);
         foreach ($context->getPlaceholders() as $key => $value) {
@@ -522,7 +526,11 @@ protected function getTemplateForm(ilMailTemplate $template = null) : ilProperty
         $placeholders = new ilManualPlaceholderInputGUI('m_message');
         $placeholders->setDisabled(!$this->isEditingAllowed());
         $placeholders->setInstructionText($this->lng->txt('mail_nacc_use_placeholder'));
-        $placeholders->setAdviseText(sprintf($this->lng->txt('placeholders_advise'), '<br />'));
+        try {
+            $placeholders->setAdviseText(sprintf($this->lng->txt('placeholders_advise'), '<br />'));
+        } catch (Throwable $e) {
+            $placeholders->setAdviseText($this->lng->txt('placeholders_advise'));
+        }
         $placeholders->supportsRerenderSignal(
             'context',
             $this->ctrl->getLinkTarget($this, 'getAjaxPlaceholdersById', '', true, false)