Show More
@@ -307,7 +307,7 b" def make_ui(read_from='file', path=None," | |||||
307 | for section in ui_sections: |
|
307 | for section in ui_sections: | |
308 | for k, v in cfg.items(section): |
|
308 | for k, v in cfg.items(section): | |
309 | log.debug('settings ui from file[%s]%s:%s' % (section, k, v)) |
|
309 | log.debug('settings ui from file[%s]%s:%s' % (section, k, v)) | |
310 | baseui.setconfig(section, k, v) |
|
310 | baseui.setconfig(safe_str(section), safe_str(k), safe_str(v)) | |
311 |
|
311 | |||
312 | elif read_from == 'db': |
|
312 | elif read_from == 'db': | |
313 | sa = meta.Session() |
|
313 | sa = meta.Session() | |
@@ -320,11 +320,13 b" def make_ui(read_from='file', path=None," | |||||
320 | if ui_.ui_active: |
|
320 | if ui_.ui_active: | |
321 | log.debug('settings ui from db[%s]%s:%s', ui_.ui_section, |
|
321 | log.debug('settings ui from db[%s]%s:%s', ui_.ui_section, | |
322 | ui_.ui_key, ui_.ui_value) |
|
322 | ui_.ui_key, ui_.ui_value) | |
323 |
baseui.setconfig(ui_.ui_section, ui_.ui_key, |
|
323 | baseui.setconfig(safe_str(ui_.ui_section), safe_str(ui_.ui_key), | |
|
324 | safe_str(ui_.ui_value)) | |||
324 | if ui_.ui_key == 'push_ssl': |
|
325 | if ui_.ui_key == 'push_ssl': | |
325 | # force set push_ssl requirement to False, rhodecode |
|
326 | # force set push_ssl requirement to False, rhodecode | |
326 | # handles that |
|
327 | # handles that | |
327 |
baseui.setconfig(ui_.ui_section, ui_.ui_key, |
|
328 | baseui.setconfig(safe_str(ui_.ui_section), safe_str(ui_.ui_key), | |
|
329 | False) | |||
328 | if clear_session: |
|
330 | if clear_session: | |
329 | meta.Session.remove() |
|
331 | meta.Session.remove() | |
330 | return baseui |
|
332 | return baseui |
General Comments 0
You need to be logged in to leave comments.
Login now