Commit 8afaea7e authored by Liang Ding's avatar Liang Ding

🎨 Fix #12768

parent fcc37e05
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
package org.b3log.solo.processor.console; package org.b3log.solo.processor.console;
import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang.StringUtils;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.Latkes; import org.b3log.latke.Latkes;
import org.b3log.latke.ioc.Inject; import org.b3log.latke.ioc.Inject;
...@@ -43,7 +42,7 @@ import org.json.JSONObject; ...@@ -43,7 +42,7 @@ import org.json.JSONObject;
* Plugin console request processing. * Plugin console request processing.
* *
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.0.0.11, Apr 19, 2019 * @version 1.0.0.12, Apr 22, 2019
* @since 0.4.0 * @since 0.4.0
*/ */
@RequestProcessor @RequestProcessor
...@@ -344,11 +343,6 @@ public class PageConsole { ...@@ -344,11 +343,6 @@ public class PageConsole {
for (int i = 0; i < pages.length(); i++) { for (int i = 0; i < pages.length(); i++) {
final JSONObject page = pages.getJSONObject(i); final JSONObject page = pages.getJSONObject(i);
final String permalink = page.optString(Page.PAGE_PERMALINK);
if (StringUtils.startsWith(permalink, "/")) {
page.put(Page.PAGE_PERMALINK, Latkes.getServePath() + permalink);
}
String title = page.optString(Page.PAGE_TITLE); String title = page.optString(Page.PAGE_TITLE);
title = StringEscapeUtils.escapeXml(title); title = StringEscapeUtils.escapeXml(title);
page.put(Page.PAGE_TITLE, title); page.put(Page.PAGE_TITLE, title);
......
...@@ -59,7 +59,7 @@ import static org.b3log.solo.model.Article.ARTICLE_CONTENT; ...@@ -59,7 +59,7 @@ import static org.b3log.solo.model.Article.ARTICLE_CONTENT;
* *
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a> * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @version 1.7.0.9, Apr 8, 2019 * @version 1.7.0.10, Apr 22, 2019
* @since 0.3.1 * @since 0.3.1
*/ */
@Service @Service
...@@ -863,13 +863,6 @@ public class DataModelService { ...@@ -863,13 +863,6 @@ public class DataModelService {
try { try {
LOGGER.debug("Filling page navigations...."); LOGGER.debug("Filling page navigations....");
final List<JSONObject> pages = pageRepository.getPages(); final List<JSONObject> pages = pageRepository.getPages();
for (final JSONObject page : pages) {
final String permalink = page.optString(Page.PAGE_PERMALINK);
if (StringUtils.startsWith(permalink, "/")) {
page.put(Page.PAGE_PERMALINK, Latkes.getServePath() + permalink);
}
}
dataModel.put(Common.PAGE_NAVIGATIONS, pages); dataModel.put(Common.PAGE_NAVIGATIONS, pages);
} catch (final RepositoryException e) { } catch (final RepositoryException e) {
LOGGER.log(Level.ERROR, "Fills page navigations failed", e); LOGGER.log(Level.ERROR, "Fills page navigations failed", e);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment