Merge pull request #12218 from b3log/1.8.0-dev

1.8.0 dev

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

@@ -68,7 +68,8 @@ import org.jsoup.Jsoup;
  * Article processor.
  *
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 1.4.2.15, Nov 20, 2015
+ * @author <a href="http://zephyr.b3log.org">Zephyr</a>
+ * @version 1.4.2.16, Nov 17, 2016
  * @since 0.3.1
  */
 @RequestProcessor
@@ -813,13 +814,8 @@ 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);
 
             final Map<String, Object> dataModel = renderer.getDataModel();

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

@@ -63,7 +63,8 @@ import org.json.JSONObject;
  *
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
  * @author <a href="http://blog.sweelia.com">ArmstrongCN</a>
- * @version 1.1.2.4, Nov 20, 2015
+ * @author <a href="http://zephyr.b3log.org">Zephyr</a>
+ * @version 1.1.3.4, Nov 17, 2016
  * @since 0.3.5
  */
 @Service
@@ -668,10 +669,6 @@ public class ArticleQueryService {
 
                 article.put(ARTICLE_CREATE_TIME, ((Date) article.get(ARTICLE_CREATE_DATE)).getTime());
 
-                // Markdown to HTML for content and abstract
-                //Delete by Zephyr:>在外部进行处理，避免出现重复处理的情况
-                //markdown(article);
-
                 ret.add(article);
             }