Skip to content

S
solo-1
Commit e4fdb5a9 authored by Van's avatar Van
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev 

# Conflicts:
#	src/main/resources/js/admin/admin.min.js
#	src/main/resources/js/common.min.js
#	src/main/resources/js/page.min.js
#	src/main/resources/skins/9IPHP/js/common.min.js
#	src/main/resources/skins/Bubble/js/common.min.js
#	src/main/resources/skins/Casper/js/common.min.js
#	src/main/resources/skins/Finding/css/base.css
#	src/main/resources/skins/Finding/js/common.min.js
#	src/main/resources/skins/Jane/js/common.min.js
#	src/main/resources/skins/Medium/js/common.min.js
#	src/main/resources/skins/NeoEase/js/common.min.js
#	src/main/resources/skins/Pinghsu/js/common.min.js
#	src/main/resources/skins/metro-hot/js/common.min.js
#	src/main/resources/skins/next/js/common.min.js
#	src/main/resources/skins/nijigen/js/common.min.js
#	src/main/resources/skins/timeline/js/common.min.js
#	src/main/resources/skins/yilia/js/common.min.js
parents 3064a57b cad5d4e0
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
src/main/java/org/b3log/solo/service/PreferenceMgmtService.java
View file @ e4fdb5a9
...@@ -225,10 +225,12 @@ public class PreferenceMgmtService { ...@@ -225,10 +225,12 @@ public class PreferenceMgmtService {
showCodeBlockLnOpt = new JSONObject(); showCodeBlockLnOpt = new JSONObject();
showCodeBlockLnOpt.put(Keys.OBJECT_ID, Option.ID_C_SHOW_CODE_BLOCK_LN); showCodeBlockLnOpt.put(Keys.OBJECT_ID, Option.ID_C_SHOW_CODE_BLOCK_LN);
showCodeBlockLnOpt.put(Option.OPTION_CATEGORY, Option.CATEGORY_C_PREFERENCE); showCodeBlockLnOpt.put(Option.OPTION_CATEGORY, Option.CATEGORY_C_PREFERENCE);
showCodeBlockLnOpt.put(Option.OPTION_VALUE, preference.optString(Option.ID_C_SHOW_CODE_BLOCK_LN));
optionRepository.add(showCodeBlockLnOpt);
} else {
showCodeBlockLnOpt.put(Option.OPTION_VALUE, preference.optString(Option.ID_C_SHOW_CODE_BLOCK_LN));
optionRepository.update(Option.ID_C_SHOW_CODE_BLOCK_LN, showCodeBlockLnOpt);
} }
showCodeBlockLnOpt.put(Option.OPTION_VALUE, preference.optString(Option.ID_C_SHOW_CODE_BLOCK_LN));
optionRepository.update(Option.ID_C_SHOW_CODE_BLOCK_LN, showCodeBlockLnOpt);
final JSONObject customVarsOpt = optionRepository.get(Option.ID_C_CUSTOM_VARS); final JSONObject customVarsOpt = optionRepository.get(Option.ID_C_CUSTOM_VARS);
customVarsOpt.put(Option.OPTION_VALUE, preference.optString(Option.ID_C_CUSTOM_VARS)); customVarsOpt.put(Option.OPTION_VALUE, preference.optString(Option.ID_C_CUSTOM_VARS));
optionRepository.update(Option.ID_C_CUSTOM_VARS, customVarsOpt); optionRepository.update(Option.ID_C_CUSTOM_VARS, customVarsOpt);
......
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