From 9def65ea36e3d31a7f6aa7a21e0d489215050cdf Mon Sep 17 00:00:00 2001
From: ranfysvalle02 <ranfys.valle@gmail.com>
Date: Sat, 9 Sep 2017 21:32:37 -0400
Subject: [PATCH] FIX: Refactor for 1.11 compatibility

---
 django_markdown/urls.py  | 7 ++++---
 django_markdown/utils.py | 8 ++++----
 django_markdown/views.py | 9 ++++++++-
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/django_markdown/urls.py b/django_markdown/urls.py
index ca80d4b..d04bb81 100644
--- a/django_markdown/urls.py
+++ b/django_markdown/urls.py
@@ -1,8 +1,9 @@
 """ Define preview URL. """
 
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
 from .views import preview
 
-urlpatterns = patterns(
-    '', url('preview/$', preview, name='django_markdown_preview'))
+urlpatterns = [
+    url(r'^preview/$', preview, name='django_markdown_preview')]
+
diff --git a/django_markdown/utils.py b/django_markdown/utils.py
index c7777e5..26aa0b7 100644
--- a/django_markdown/utils.py
+++ b/django_markdown/utils.py
@@ -3,7 +3,7 @@
 import markdown as markdown_module
 from django.utils.encoding import force_text
 from django.utils.safestring import mark_safe
-from django.template import loader, Context
+from django.template import loader
 
 try:
     import json as simplejson
@@ -41,7 +41,7 @@ def editor_js_initialization(selector, **extra_settings):
         previewParserPath=reverse('django_markdown_preview'),
         **settings.MARKDOWN_EDITOR_SETTINGS)
     options.update(extra_settings)
-    ctx = Context(dict(
-        selector=selector, extra_settings=simplejson.dumps(options)),
-        autoescape=False)
+    ctx = dict(selector=selector,
+               extra_settings=mark_safe(simplejson.dumps(options)))
     return INIT_TEMPLATE.render(ctx)
+
diff --git a/django_markdown/views.py b/django_markdown/views.py
index dbf352f..30b3011 100644
--- a/django_markdown/views.py
+++ b/django_markdown/views.py
@@ -17,8 +17,15 @@ def preview(request):
             from django.contrib.auth.views import redirect_to_login
             return redirect_to_login(request.get_full_path())
 
+    # https://github.com/klen/django_markdown/pull/60
+    if request.POST:
+        content = request.POST.get('data', 'No content posted.')
+    else:
+        content = request.REQUEST.get('data', 'No content posted.')
+
     return render(
         request, settings.MARKDOWN_PREVIEW_TEMPLATE, dict(
-            content=request.REQUEST.get('data', 'No content posted'),
+            content=content,
             css=settings.MARKDOWN_STYLE
         ))
+