From f6e75f806097113b55884fef3fc2be2ce9e6bd2f Mon Sep 17 00:00:00 2001
From: liangliangyy <liangliangyy@gmail.com>
Date: Thu, 8 Jun 2017 14:30:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=87=E7=AB=A0=E6=91=98?=
 =?UTF-8?q?=E8=A6=81=E6=88=AA=E5=8F=96=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 blog/templatetags/blog_tags.py        | 4 ++--
 templates/blog/tags/article_info.html | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/blog/templatetags/blog_tags.py b/blog/templatetags/blog_tags.py
index c9bf164..7adb02f 100644
--- a/blog/templatetags/blog_tags.py
+++ b/blog/templatetags/blog_tags.py
@@ -71,9 +71,9 @@ def truncatechars_content(content):
 @register.filter(is_safe=True)
 @stringfilter
 def truncate(content):
-    from django.template.defaultfilters import truncatechars
+    from django.utils.html import strip_tags
 
-    return truncatechars(content, 150)
+    return strip_tags(content)[:150]
 
 
 @register.inclusion_tag('blog/tags/breadcrumb.html')
diff --git a/templates/blog/tags/article_info.html b/templates/blog/tags/article_info.html
index e894313..44e1b61 100644
--- a/templates/blog/tags/article_info.html
+++ b/templates/blog/tags/article_info.html
@@ -38,7 +38,7 @@
 
     <div class="entry-content" itemprop="articleBody">
         {% if  isindex %}
-            {{ article.body|truncatechars_content|custom_markdown }}
+            {{ article.body|custom_markdown|truncatechars_content }}
             <p class='read-more'><a
                     href=' {{ article.get_absolute_url }}'>Read more</a></p>
         {% else %}