Merge pull request #12217 from b3log/master

rebase

src/main/java/org/b3log/solo/processor/ArticleProcessor.java

@@ -813,6 +813,11 @@ public class ArticleProcessor {
                 final JSONObject author = articleQueryService.getAuthor(articles.get(0));
 
                 filler.setArticlesExProperties(request, articles, author, preference);
+            } else{
+            	//Add by Zephyr:>
+            	//如果进入setArticlesExProperties方法，方法内部有markdown的过程，而原归档查询已经做了markdown，造成二次解析
+            	//将getArticlesByArchiveDate的MD注释，移到此处。
+            	articleQueryService.markdowns(articles);
             }
             
             sort(preference, articles);

src/main/java/org/b3log/solo/service/ArticleQueryService.java

@@ -669,7 +669,8 @@ public class ArticleQueryService {
                 article.put(ARTICLE_CREATE_TIME, ((Date) article.get(ARTICLE_CREATE_DATE)).getTime());
 
                 // Markdown to HTML for content and abstract
-                markdown(article);
+                //Delete by Zephyr:>在外部进行处理，避免出现重复处理的情况
+                //markdown(article);
 
                 ret.add(article);
             }