diff options
| author | Dylan William Hardison <dylan@hardison.net> | 2018-10-14 18:19:50 +0200 |
|---|---|---|
| committer | Dylan William Hardison <dylan@hardison.net> | 2018-10-14 18:19:50 +0200 |
| commit | ce00a61057535d49aa0e83181a1d317d7842571b (patch) | |
| tree | 280243de9ff791449fb2c82f3f0f2b9bd931d5b2 /template/en/default/global/code-error.html.tmpl | |
| parent | 6367a26da4093a8379e370ef328e9507c98b2e7e (diff) | |
| parent | 6657fa9f5210d5b5a9b14c0cba6882bd56232054 (diff) | |
| download | bugzilla-ce00a61057535d49aa0e83181a1d317d7842571b.tar.gz bugzilla-ce00a61057535d49aa0e83181a1d317d7842571b.tar.xz | |
Merge remote-tracking branch 'bmo/master'
Diffstat (limited to 'template/en/default/global/code-error.html.tmpl')
| -rw-r--r-- | template/en/default/global/code-error.html.tmpl | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl index b37e7ca7b..8aaf10127 100644 --- a/template/en/default/global/code-error.html.tmpl +++ b/template/en/default/global/code-error.html.tmpl @@ -315,7 +315,7 @@ [% ELSIF error == "jobqueue_status_error" %] An error occurred while checking the job queue status. Try again at a - later time. + later time. [% ELSIF error == "ldap_bind_failed" %] Failed to bind to the LDAP server. The error message was: @@ -514,13 +514,15 @@ [%# We only want HTML error messages for ERROR_MODE_WEBPAGE %] [% USE Bugzilla %] -[% IF Bugzilla.error_mode != constants.ERROR_MODE_WEBPAGE %] - [% IF Bugzilla.usage_mode == constants.USAGE_MODE_BROWSER %] - [% error_message FILTER none %] - [% ELSE %] - [% error_message FILTER txt %] +[% IF Bugzilla.usage_mode != constants.USAGE_MODE_MOJO %] + [% IF Bugzilla.error_mode != constants.ERROR_MODE_WEBPAGE %] + [% IF Bugzilla.usage_mode == constants.USAGE_MODE_BROWSER %] + [% error_message FILTER none %] + [% ELSE %] + [% error_message FILTER txt %] + [% END %] + [% RETURN %] [% END %] - [% RETURN %] [% END %] [% UNLESS header_done %] |