diff --git a/evennia/web/templates/website/help_detail.html b/evennia/web/templates/website/help_detail.html index 4c1f51d0cf..9da5ad3a1f 100644 --- a/evennia/web/templates/website/help_detail.html +++ b/evennia/web/templates/website/help_detail.html @@ -25,7 +25,7 @@
-

{{ entry_text }}

+
{{ entry_text }}
{% if topic_previous or topic_next %}
diff --git a/evennia/web/website/views/help.py b/evennia/web/website/views/help.py index e2ceae23cb..e9dbb8be42 100644 --- a/evennia/web/website/views/help.py +++ b/evennia/web/website/views/help.py @@ -1,6 +1,8 @@ """ Views to manipulate help entries. +Multi entry object type supported added by DaveWithTheNiceHat 2021 + Pull Request #2429 """ from django.utils.text import slugify from django.conf import settings @@ -11,6 +13,7 @@ from evennia.help.models import HelpEntry from evennia.help.filehelp import FILE_HELP_ENTRIES from .mixins import TypeclassMixin from evennia.utils.logger import log_info +from evennia.utils.ansi import strip_ansi DEFAULT_HELP_CATEGORY = settings.DEFAULT_HELP_CATEGORY @@ -305,10 +308,8 @@ class HelpDetailView(HelpMixin, DetailView): text = obj.db_entrytext elif inherits_from(obj, "evennia.help.filehelp.FileHelpEntry"): text = obj.entrytext - text = text.replace("\r\n\r\n", "\n\n") - text = text.replace("\r\n", "\n") - text = text.replace("\n", "
") - context["entry_text"] = text + text = strip_ansi(text) # remove ansii markups + context["entry_text"] = text.strip() log_info('get_context_data success') return context