Merge pull request #24007 from demeritcowboy/pdf-error

Fix test. Don't hide errors. (Followup to 23999)
civicrm · Jul 18, 2022 · 11302a9 · 11302a9
2 parents b04fd95 + 374e164
commit 11302a9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CRM/Contact/Form/Task/PDFTrait.php b/CRM/Contact/Form/Task/PDFTrait.php
@@ -505,7 +505,7 @@ public function formatMessage(&$message) {
       ],
     ];
 
-    $htmlMsg = preg_split($newLineOperators['p']['pattern'], ($message ?? ''));
+    $htmlMsg = preg_split($newLineOperators['p']['pattern'], $message);
     foreach ($htmlMsg as $k => & $m) {
       $messages = preg_split($newLineOperators['br']['pattern'], $m);
       foreach ($messages as $key => & $msg) {

diff --git a/tests/phpunit/CRM/Contact/Form/Task/PDFLetterCommonTest.php b/tests/phpunit/CRM/Contact/Form/Task/PDFLetterCommonTest.php
@@ -52,6 +52,7 @@ public function testFilenameIsAssigned(?string $pdfFileName, ?string $activitySu
     $form = $this->getPDFForm([
       'pdf_file_name' => $pdfFileName,
       'subject' => $activitySubject,
+      'html_message' => '<p></p>',
     ], [$this->contactId], $isLiveMode);
     $fileNameAssigned = $this->submitForm($form)['fileName'];
     $this->assertEquals($expectedFilename, $fileNameAssigned);