Show More
@@ -219,14 +219,10 b' def add_pylons_compat_data(registry, glo' | |||||
219 |
|
219 | |||
220 |
|
220 | |||
221 | def error_handler(exception, request): |
|
221 | def error_handler(exception, request): | |
222 | from rhodecode.model.settings import SettingsModel |
|
222 | import rhodecode | |
223 | from rhodecode.lib.utils2 import AttributeDict |
|
223 | from rhodecode.lib.utils2 import AttributeDict | |
224 |
|
224 | |||
225 | try: |
|
225 | rhodecode_title = rhodecode.CONFIG.get('rhodecode_title') or 'RhodeCode' | |
226 | rc_config = SettingsModel().get_all_settings() |
|
|||
227 | except Exception: |
|
|||
228 | log.exception('failed to fetch settings') |
|
|||
229 | rc_config = {} |
|
|||
230 |
|
226 | |||
231 | base_response = HTTPInternalServerError() |
|
227 | base_response = HTTPInternalServerError() | |
232 | # prefer original exception for the response since it may have headers set |
|
228 | # prefer original exception for the response since it may have headers set | |
@@ -251,7 +247,7 b' def error_handler(exception, request):' | |||||
251 | request.route_url('rhodecode_support') |
|
247 | request.route_url('rhodecode_support') | |
252 | ) |
|
248 | ) | |
253 | c.redirect_time = 0 |
|
249 | c.redirect_time = 0 | |
254 |
c.rhodecode_name = |
|
250 | c.rhodecode_name = rhodecode_title | |
255 | if not c.rhodecode_name: |
|
251 | if not c.rhodecode_name: | |
256 | c.rhodecode_name = 'Rhodecode' |
|
252 | c.rhodecode_name = 'Rhodecode' | |
257 |
|
253 |
General Comments 0
You need to be logged in to leave comments.
Login now