Rafał Pitoń 10 лет назад
Родитель
Сommit
5f39fe251a
3 измененных файлов с 5 добавлено и 13 удалено
  1. 0 8
      docs/developers/markup.rst
  2. 5 4
      misago/legal/views.py
  3. 0 1
      misago/markup/__init__.py

+ 0 - 8
docs/developers/markup.rst

@@ -27,14 +27,6 @@ common_flavour
 Convenience function that wraps ``parse()``. This function is used for parsing messages.
 
 
-limited_flavour
---------------
-
-.. function:: limited_flavour(text)
-
-Convenience function that wraps ``parse()``. This function is used for parsing short messages and supports only subset of full markup. Unlike other functions, this one returns parsed string instead of dict.
-
-
 Extending Markup
 ================
 

+ 5 - 4
misago/legal/views.py

@@ -9,7 +9,7 @@ from misago.core.cache import cache
 from misago.markup import common_flavour
 
 
-def get_parsed_content(setting_name):
+def get_parsed_content(request, setting_name):
     cache_name = 'misago_legal_%s' % setting_name
     cached_content = cache.get(cache_name)
 
@@ -21,9 +21,10 @@ def get_parsed_content(setting_name):
     if cached_content and cached_content.get('checksum') == unparsed_checksum:
         return cached_content['parsed']
     else:
+        parsed = common_flavour(request, None, unparsed_content)['parsed_text']
         cached_content = {
             'checksum': unparsed_checksum,
-            'parsed': common_flavour(unparsed_content)['parsed_text'],
+            'parsed': parsed,
         }
         cache.set(cache_name, cached_content)
         return cached_content['parsed']
@@ -36,7 +37,7 @@ def terms(request):
     if settings.terms_of_service_link:
         return redirect(settings.terms_of_service_link)
 
-    parsed_content = get_parsed_content('terms_of_service')
+    parsed_content = get_parsed_content(request, 'terms_of_service')
     return render(request, 'misago/legal/terms_of_service.html', {
         'title': settings.terms_of_service_title or _("Terms of service"),
         'content': parsed_content,
@@ -50,7 +51,7 @@ def privacy_policy(request):
     if settings.privacy_policy_link:
         return redirect(settings.privacy_policy_link)
 
-    parsed_content = get_parsed_content('privacy_policy')
+    parsed_content = get_parsed_content(request, 'privacy_policy')
     return render(request, 'misago/legal/privacy_policy.html', {
         'title': settings.privacy_policy_title or _("Privacy policy"),
         'content': parsed_content,

+ 0 - 1
misago/markup/__init__.py

@@ -1,6 +1,5 @@
 # flake8: noqa
 from misago.markup.flavours import (common as common_flavour,
-                                    limited as limited_flavour,
                                     signature as signature_flavour)
 from misago.markup.parser import parse
 from misago.markup.editor import Editor