diff options
| author | Frédéric Buclin <LpSolit@gmail.com> | 2015-04-08 15:30:08 +0200 |
|---|---|---|
| committer | Frédéric Buclin <LpSolit@gmail.com> | 2015-04-08 15:30:08 +0200 |
| commit | e6d2fb75aa3c183323c534a214f3dd9be5638676 (patch) | |
| tree | 62af66d0a54b5e2d8638e404a7bb794e2d218afe | |
| parent | 721ce1638ad8e613efec8aff3ed3ca0110ad08e3 (diff) | |
| download | bugzilla-e6d2fb75aa3c183323c534a214f3dd9be5638676.tar.gz bugzilla-e6d2fb75aa3c183323c534a214f3dd9be5638676.tar.xz | |
Backout bug 1089475, it causes deep recursions when the DB server is not accessible
| -rw-r--r-- | Bugzilla/DB.pm | 5 | ||||
| -rw-r--r-- | template/en/default/global/code-error.html.tmpl | 4 |
2 files changed, 0 insertions, 9 deletions
diff --git a/Bugzilla/DB.pm b/Bugzilla/DB.pm index afe728ca7..9f3ed0f49 100644 --- a/Bugzilla/DB.pm +++ b/Bugzilla/DB.pm @@ -142,11 +142,6 @@ sub _handle_error { $_[0] = substr($_[0], 0, 2000) . ' ... ' . substr($_[0], -2000) if length($_[0]) > 4000; $_[0] = Carp::longmess($_[0]); - - if (Bugzilla->usage_mode == USAGE_MODE_BROWSER) { - ThrowCodeError("db_error", { err_message => $_[0] }); - } - return 0; # Now let DBI handle raising the error } diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl index a242c7471..d73d75e13 100644 --- a/template/en/default/global/code-error.html.tmpl +++ b/template/en/default/global/code-error.html.tmpl @@ -104,10 +104,6 @@ [% ELSIF error == "comment_type_invalid" %] '[% type FILTER html %]' is not a valid comment type. - [% ELSIF error == "db_error" %] - An error occurred while performing a database operation: - <pre>[% err_message FILTER html %]</pre> - [% ELSIF error == "db_rename_conflict" %] Name conflict: Cannot rename [% old FILTER html %] to [%+ new FILTER html %] because [% new FILTER html %] already exists. |