Fix: #2600 - refactor markdown formatting to allow XREF links to be disabled

2 files changed, 17 insertions, 5 deletions

diff --git a/resources/views/modules/user-messages/user-messages.phtml b/resources/views/modules/user-messages/user-messages.phtml
index a1c68c455d..abc052035c 100644
--- a/resources/views/modules/user-messages/user-messages.phtml
+++ b/resources/views/modules/user-messages/user-messages.phtml
@@ -1,11 +1,11 @@
 <?php
 
-use Fisharebest\Webtrees\Filter;
 use Fisharebest\Webtrees\Http\RequestHandlers\MessagePage;
 use Fisharebest\Webtrees\Http\RequestHandlers\MessageSelect;
 use Fisharebest\Webtrees\Http\RequestHandlers\UserPage;
 use Fisharebest\Webtrees\I18N;
 use Fisharebest\Webtrees\Module\ModuleInterface;
+use Fisharebest\Webtrees\Registry;
 use Fisharebest\Webtrees\Services\UserService;
 use Fisharebest\Webtrees\Tree;
 use Fisharebest\Webtrees\User;
@@ -107,7 +107,7 @@ use Illuminate\Support\Collection;
                         <td class="list_value_wrap" colspan="4">
                             <div id="message<?= $message->message_id ?>" class="collapse">
                                 <div dir="auto" style="white-space: pre-wrap;">
-                                    <?= Filter::expandUrls($message->body, $tree) ?>
+                                    <?= Registry::markdownFactory()->autolink()->convertToHtml($message->body) ?>
                                 </div>
                                 <br>
 
diff --git a/resources/views/note-page-details.phtml b/resources/views/note-page-details.phtml
index 8b73378240..1de82e5d27 100644
--- a/resources/views/note-page-details.phtml
+++ b/resources/views/note-page-details.phtml
@@ -2,11 +2,11 @@
 
 use Fisharebest\Webtrees\Auth;
 use Fisharebest\Webtrees\Fact;
-use Fisharebest\Webtrees\Filter;
 use Fisharebest\Webtrees\Functions\FunctionsPrintFacts;
 use Fisharebest\Webtrees\Http\RequestHandlers\EditNotePage;
 use Fisharebest\Webtrees\I18N;
 use Fisharebest\Webtrees\Note;
+use Fisharebest\Webtrees\Registry;
 use Illuminate\Support\Collection;
 
 /**
@@ -32,10 +32,22 @@ use Illuminate\Support\Collection;
                 </div>
             <?php endif ?>
         </th>
-        <td><?= Filter::formatText($record->getNote(), $record->tree()) ?></td>
+        <td>
+            <?php if ($record->tree()->getPreference('FORMAT_TEXT') === 'markdown') : ?>
+                <div class="markdown" dir="auto">
+                    <?= Registry::markdownFactory()->markdown($record->tree())->convertToHtml($record->getNote()) ?>
+                </div>
+            <?php else : ?>
+                <div class="markdown" dir="auto" style="white-space: pre-wrap;">
+                    <?= Registry::markdownFactory()->autolink($record->tree())->convertToHtml($record->getNote()) ?>
+                </div>
+            <?php endif ?>
+        </td>
     </tr>
 
     <?php foreach ($record->facts() as $fact) : ?>
-        <?php FunctionsPrintFacts::printFact($fact, $record) ?>
+        <?php if ($fact->tag() !== 'NOTE:CONT') : ?>
+           <?php FunctionsPrintFacts::printFact($fact, $record) ?>
+    <?php endif ?>
     <?php endforeach ?>
 </table>