Backout bug 1089475, it causes deep recursions when the DB server is not accessible

diff --git a/Bugzilla/DB.pm b/Bugzilla/DB.pm
index afe728ca7dcddc084ad2e56911adbd5fb87baf85..9f3ed0f494dca73c61321c5ef40db4c7f3a3ffc7 100644 (file)
--- 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 a242c74712ce472dac507f917aec74c473481f1a..d73d75e135d6e174449affc1f3164b87626aacb5 100644 (file)
--- 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.