Skip to content

S
solo-1
Commit 6face59b authored by Liang Ding's avatar Liang Ding
Browse files
Options

Fix #12023

parent f6499f37
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 7 deletions
core/src/main/java/org/b3log/solo/processor/util/Filler.java
View file @ 6face59b
...@@ -68,7 +68,7 @@ import org.json.JSONObject; ...@@ -68,7 +68,7 @@ import org.json.JSONObject;
* Filler utilities. * Filler utilities.
* *
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.3.9.11, Jun 15, 2015 * @version 1.3.10.11, Jul 2, 2015
* @since 0.3.1 * @since 0.3.1
*/ */
@Service @Service
...@@ -625,15 +625,17 @@ public class Filler { ...@@ -625,15 +625,17 @@ public class Filler {
dataModel.put(Preference.BLOG_SUBTITLE, preference.getString(Preference.BLOG_SUBTITLE)); dataModel.put(Preference.BLOG_SUBTITLE, preference.getString(Preference.BLOG_SUBTITLE));
dataModel.put(Preference.HTML_HEAD, preference.getString(Preference.HTML_HEAD)); dataModel.put(Preference.HTML_HEAD, preference.getString(Preference.HTML_HEAD));
final String metaKeywords = preference.getString(Preference.META_KEYWORDS); String metaKeywords = preference.getString(Preference.META_KEYWORDS);
if (!Strings.isEmptyOrNull(metaKeywords)) { if (Strings.isEmptyOrNull(metaKeywords)) {
dataModel.put(Preference.META_KEYWORDS, metaKeywords); metaKeywords = "";
} }
dataModel.put(Preference.META_KEYWORDS, metaKeywords);
final String metaDescription = preference.getString(Preference.META_DESCRIPTION); String metaDescription = preference.getString(Preference.META_DESCRIPTION);
if (!Strings.isEmptyOrNull(metaDescription)) { if (Strings.isEmptyOrNull(metaDescription)) {
dataModel.put(Preference.META_DESCRIPTION, metaDescription); metaDescription = "";
} }
dataModel.put(Preference.META_DESCRIPTION, metaDescription);
dataModel.put(Common.YEAR, String.valueOf(Calendar.getInstance().get(Calendar.YEAR))); dataModel.put(Common.YEAR, String.valueOf(Calendar.getInstance().get(Calendar.YEAR)));
dataModel.put(Common.IS_LOGGED_IN, null != userQueryService.getCurrentUser(request)); dataModel.put(Common.IS_LOGGED_IN, null != userQueryService.getCurrentUser(request));
......
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